powermenu: make customizable + add dms restart

Common/SettingsData.qml

@@ -292,6 +292,8 @@ Singleton {
     property bool osdAlwaysShowValue: false
 
     property bool powerActionConfirm: true
+    property var powerMenuActions: ["reboot", "logout", "poweroff", "lock", "suspend", "restart"]
+    property string powerMenuDefaultAction: "logout"
     property string customPowerActionLock: ""
     property string customPowerActionLogout: ""
     property string customPowerActionSuspend: ""

Common/settings/SettingsSpec.js

@@ -203,6 +203,8 @@ var SPEC = {
     osdAlwaysShowValue: { def: false },
 
     powerActionConfirm: { def: true },
+    powerMenuActions: { def: ["reboot", "logout", "poweroff", "lock", "suspend", "restart"] },
+    powerMenuDefaultAction: { def: "logout" },
     customPowerActionLock: { def: "" },
     customPowerActionLogout: { def: "" },
     customPowerActionSuspend: { def: "" },

Modals/PowerMenuModal.qml

@@ -12,9 +12,12 @@ DankModal {
 
     property int selectedRow: 0
     property int selectedCol: 0
-    property int selectedIndex: selectedRow * 3 + selectedCol
+    property int selectedIndex: selectedRow * gridColumns + selectedCol
     property rect parentBounds: Qt.rect(0, 0, 0, 0)
     property var parentScreen: null
+    property var visibleActions: []
+    property int gridColumns: 3
+    property int gridRows: 2
 
     signal powerActionRequested(string action, string title, string message)
     signal lockRequested
@@ -33,9 +36,100 @@ DankModal {
         open()
     }
 
+    function updateVisibleActions() {
+        const allActions = SettingsData.powerMenuActions || ["reboot", "logout", "poweroff", "lock", "suspend", "restart"]
+        visibleActions = allActions.filter(action => {
+                                               if (action === "hibernate" && !SessionService.hibernateSupported)
+                                               return false
+                                               return true
+                                           })
+
+        const count = visibleActions.length
+        switch (count) {
+        case 0:
+            gridColumns = 1
+            gridRows = 1
+            break
+        case 1:
+        case 2:
+        case 3:
+            gridColumns = 1
+            gridRows = count
+            break
+        case 4:
+            gridColumns = 2
+            gridRows = 2
+            break
+        default:
+            gridColumns = 3
+            gridRows = Math.ceil(count / 3)
+            break
+        }
+    }
+
+    function getDefaultActionIndex() {
+        const defaultAction = SettingsData.powerMenuDefaultAction || "logout"
+        const index = visibleActions.indexOf(defaultAction)
+        return index >= 0 ? index : 0
+    }
+
     function getActionAtIndex(index) {
-        const actions = ["reboot", "logout", "poweroff", "lock", "suspend", SessionService.hibernateSupported ? "hibernate" : "restart"]
+        if (index < 0 || index >= visibleActions.length)
-        return actions[index]
+            return ""
+        return visibleActions[index]
+    }
+
+    function getActionData(action) {
+        switch (action) {
+        case "reboot":
+            return {
+                "icon": "restart_alt",
+                "label": I18n.tr("Reboot"),
+                "key": "R"
+            }
+        case "logout":
+            return {
+                "icon": "logout",
+                "label": I18n.tr("Log Out"),
+                "key": "X"
+            }
+        case "poweroff":
+            return {
+                "icon": "power_settings_new",
+                "label": I18n.tr("Power Off"),
+                "key": "P"
+            }
+        case "lock":
+            return {
+                "icon": "lock",
+                "label": I18n.tr("Lock"),
+                "key": "L"
+            }
+        case "suspend":
+            return {
+                "icon": "bedtime",
+                "label": I18n.tr("Suspend"),
+                "key": "S"
+            }
+        case "hibernate":
+            return {
+                "icon": "ac_unit",
+                "label": I18n.tr("Hibernate"),
+                "key": "H"
+            }
+        case "restart":
+            return {
+                "icon": "refresh",
+                "label": I18n.tr("Restart DMS"),
+                "key": "D"
+            }
+        default:
+            return {
+                "icon": "help",
+                "label": action,
+                "key": "?"
+            }
+        }
     }
 
     function selectOption(action) {
@@ -79,7 +173,7 @@ DankModal {
     }
 
     shouldBeVisible: false
-    width: 550
+    width: Math.min(550, gridColumns * 180 + Theme.spacingS * (gridColumns - 1) + Theme.spacingL * 2)
     height: contentLoader.item ? contentLoader.item.implicitHeight : 300
     enableShadow: true
     screen: parentScreen
@@ -92,32 +186,33 @@ DankModal {
         }
         return Qt.point(0, 0)
     }
-    onBackgroundClicked: () => {
+    onBackgroundClicked: () => close()
-                             return close()
-                         }
     onOpened: () => {
-                  selectedRow = 0
+                  updateVisibleActions()
-                  selectedCol = 1
+                  const defaultIndex = getDefaultActionIndex()
+                  selectedRow = Math.floor(defaultIndex / gridColumns)
+                  selectedCol = defaultIndex % gridColumns
                   Qt.callLater(() => modalFocusScope.forceActiveFocus())
               }
+    Component.onCompleted: updateVisibleActions()
     modalFocusScope.Keys.onPressed: event => {
                                         switch (event.key) {
                                             case Qt.Key_Left:
-                                            selectedCol = (selectedCol - 1 + 3) % 3
+                                            selectedCol = (selectedCol - 1 + gridColumns) % gridColumns
                                             event.accepted = true
                                             break
                                             case Qt.Key_Right:
-                                            selectedCol = (selectedCol + 1) % 3
+                                            selectedCol = (selectedCol + 1) % gridColumns
                                             event.accepted = true
                                             break
                                             case Qt.Key_Up:
                                             case Qt.Key_Backtab:
-                                            selectedRow = (selectedRow - 1 + 2) % 2
+                                            selectedRow = (selectedRow - 1 + gridRows) % gridRows
                                             event.accepted = true
                                             break
                                             case Qt.Key_Down:
                                             case Qt.Key_Tab:
-                                            selectedRow = (selectedRow + 1) % 2
+                                            selectedRow = (selectedRow + 1) % gridRows
                                             event.accepted = true
                                             break
                                             case Qt.Key_Return:
@@ -127,25 +222,28 @@ DankModal {
                                             break
                                             case Qt.Key_N:
                                             if (event.modifiers & Qt.ControlModifier) {
-                                                selectedCol = (selectedCol + 1) % 3
+                                                selectedCol = (selectedCol + 1) % gridColumns
                                                 event.accepted = true
                                             }
                                             break
                                             case Qt.Key_P:
-                                            if (event.modifiers & Qt.ControlModifier) {
+                                            if (!(event.modifiers & Qt.ControlModifier)) {
-                                                selectedCol = (selectedCol - 1 + 3) % 3
+                                                selectOption("poweroff")
+                                                event.accepted = true
+                                            } else {
+                                                selectedCol = (selectedCol - 1 + gridColumns) % gridColumns
                                                 event.accepted = true
                                             }
                                             break
                                             case Qt.Key_J:
                                             if (event.modifiers & Qt.ControlModifier) {
-                                                selectedRow = (selectedRow + 1) % 2
+                                                selectedRow = (selectedRow + 1) % gridRows
                                                 event.accepted = true
                                             }
                                             break
                                             case Qt.Key_K:
                                             if (event.modifiers & Qt.ControlModifier) {
-                                                selectedRow = (selectedRow - 1 + 2) % 2
+                                                selectedRow = (selectedRow - 1 + gridRows) % gridRows
                                                 event.accepted = true
                                             }
                                             break
@@ -157,10 +255,6 @@ DankModal {
                                             selectOption("logout")
                                             event.accepted = true
                                             break
-                                            case Qt.Key_P:
-                                            selectOption("poweroff")
-                                            event.accepted = true
-                                            break
                                             case Qt.Key_L:
                                             selectOption("lock")
                                             event.accepted = true
@@ -170,7 +264,11 @@ DankModal {
                                             event.accepted = true
                                             break
                                             case Qt.Key_H:
-                                            selectOption(SessionService.hibernateSupported ? "hibernate" : "restart")
+                                            selectOption("hibernate")
+                                            event.accepted = true
+                                            break
+                                            case Qt.Key_D:
+                                            selectOption("restart")
                                             event.accepted = true
                                             break
                                         }
@@ -179,52 +277,64 @@ DankModal {
     content: Component {
         Item {
             anchors.fill: parent
-            implicitHeight: mainColumn.implicitHeight + Theme.spacingL * 2
+            implicitHeight: buttonGrid.implicitHeight + Theme.spacingL * 2
 
-            Column {
+            Grid {
-                id: mainColumn
+                id: buttonGrid
-                anchors.fill: parent
+                anchors.centerIn: parent
-                anchors.margins: Theme.spacingL
+                columns: root.gridColumns
-                spacing: Theme.spacingM
+                columnSpacing: Theme.spacingS
+                rowSpacing: Theme.spacingS
 
-                Grid {
+                Repeater {
-                    width: parent.width
+                    model: root.visibleActions
-                    columns: 3
-                    columnSpacing: Theme.spacingS
-                    rowSpacing: Theme.spacingS
 
                     Rectangle {
-                        id: rebootButton
+                        required property int index
-                        width: (parent.width - Theme.spacingS * 2) / 3
+                        required property string modelData
+
+                        readonly property var actionData: root.getActionData(modelData)
+                        readonly property bool isSelected: root.selectedIndex === index
+                        readonly property bool showWarning: modelData === "reboot" || modelData === "poweroff"
+
+                        width: (root.width - Theme.spacingL * 2 - Theme.spacingS * (root.gridColumns - 1)) / root.gridColumns
                         height: 100
                         radius: Theme.cornerRadius
                         color: {
-                            if (root.selectedIndex === 0) {
+                            if (isSelected)
                                 return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-                            } else if (rebootArea.containsMouse) {
+                            if (mouseArea.containsMouse)
                                 return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                            } else {
+                            return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
-                            }
                         }
-                        border.color: root.selectedIndex === 0 ? Theme.primary : "transparent"
+                        border.color: isSelected ? Theme.primary : "transparent"
-                        border.width: root.selectedIndex === 0 ? 2 : 0
+                        border.width: isSelected ? 2 : 0
 
                         Column {
                             anchors.centerIn: parent
                             spacing: Theme.spacingS
 
                             DankIcon {
-                                name: "restart_alt"
+                                name: parent.parent.actionData.icon
                                 size: Theme.iconSize + 8
-                                color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
+                                color: {
+                                    if (parent.parent.showWarning && mouseArea.containsMouse) {
+                                        return parent.parent.modelData === "poweroff" ? Theme.error : Theme.warning
+                                    }
+                                    return Theme.surfaceText
+                                }
                                 anchors.horizontalCenter: parent.horizontalCenter
                             }
 
                             StyledText {
-                                text: I18n.tr("Reboot")
+                                text: parent.parent.actionData.label
                                 font.pixelSize: Theme.fontSizeMedium
-                                color: rebootArea.containsMouse ? Theme.warning : Theme.surfaceText
+                                color: {
+                                    if (parent.parent.showWarning && mouseArea.containsMouse) {
+                                        return parent.parent.modelData === "poweroff" ? Theme.error : Theme.warning
+                                    }
+                                    return Theme.surfaceText
+                                }
                                 font.weight: Font.Medium
                                 anchors.horizontalCenter: parent.horizontalCenter
                             }
@@ -237,7 +347,7 @@ DankModal {
                                 anchors.horizontalCenter: parent.horizontalCenter
 
                                 StyledText {
-                                    text: "R"
+                                    text: parent.parent.parent.actionData.key
                                     font.pixelSize: Theme.fontSizeSmall - 1
                                     color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
                                     font.weight: Font.Medium
@@ -247,351 +357,17 @@ DankModal {
                         }
 
                         MouseArea {
-                            id: rebootArea
+                            id: mouseArea
                             anchors.fill: parent
                             hoverEnabled: true
                             cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
+                            onClicked: {
-                                           root.selectedRow = 0
+                                root.selectedRow = Math.floor(index / root.gridColumns)
-                                           root.selectedCol = 0
+                                root.selectedCol = index % root.gridColumns
-                                           selectOption("reboot")
+                                root.selectOption(modelData)
-                                       }
+                            }
                         }
                     }
-
-                    Rectangle {
-                        id: logoutButton
-                        width: (parent.width - Theme.spacingS * 2) / 3
-                        height: 100
-                        radius: Theme.cornerRadius
-                        color: {
-                            if (root.selectedIndex === 1) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-                            } else if (logoutArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
-                            }
-                        }
-                        border.color: root.selectedIndex === 1 ? Theme.primary : "transparent"
-                        border.width: root.selectedIndex === 1 ? 2 : 0
-
-                        Column {
-                            anchors.centerIn: parent
-                            spacing: Theme.spacingS
-
-                            DankIcon {
-                                name: "logout"
-                                size: Theme.iconSize + 8
-                                color: Theme.surfaceText
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Log Out")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-
-                            Rectangle {
-                                width: 20
-                                height: 16
-                                radius: 4
-                                color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.1)
-                                anchors.horizontalCenter: parent.horizontalCenter
-
-                                StyledText {
-                                    text: "X"
-                                    font.pixelSize: Theme.fontSizeSmall - 1
-                                    color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
-                                    font.weight: Font.Medium
-                                    anchors.centerIn: parent
-                                }
-                            }
-                        }
-
-                        MouseArea {
-                            id: logoutArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                           root.selectedRow = 0
-                                           root.selectedCol = 1
-                                           selectOption("logout")
-                                       }
-                        }
-                    }
-
-                    Rectangle {
-                        id: poweroffButton
-                        width: (parent.width - Theme.spacingS * 2) / 3
-                        height: 100
-                        radius: Theme.cornerRadius
-                        color: {
-                            if (root.selectedIndex === 2) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-                            } else if (poweroffArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
-                            }
-                        }
-                        border.color: root.selectedIndex === 2 ? Theme.primary : "transparent"
-                        border.width: root.selectedIndex === 2 ? 2 : 0
-
-                        Column {
-                            anchors.centerIn: parent
-                            spacing: Theme.spacingS
-
-                            DankIcon {
-                                name: "power_settings_new"
-                                size: Theme.iconSize + 8
-                                color: poweroffArea.containsMouse ? Theme.error : Theme.surfaceText
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Power Off")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: poweroffArea.containsMouse ? Theme.error : Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-
-                            Rectangle {
-                                width: 20
-                                height: 16
-                                radius: 4
-                                color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.1)
-                                anchors.horizontalCenter: parent.horizontalCenter
-
-                                StyledText {
-                                    text: "P"
-                                    font.pixelSize: Theme.fontSizeSmall - 1
-                                    color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
-                                    font.weight: Font.Medium
-                                    anchors.centerIn: parent
-                                }
-                            }
-                        }
-
-                        MouseArea {
-                            id: poweroffArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                           root.selectedRow = 0
-                                           root.selectedCol = 2
-                                           selectOption("poweroff")
-                                       }
-                        }
-                    }
-
-                    Rectangle {
-                        id: lockButton
-                        width: (parent.width - Theme.spacingS * 2) / 3
-                        height: 100
-                        radius: Theme.cornerRadius
-                        color: {
-                            if (root.selectedIndex === 3) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-                            } else if (lockArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
-                            }
-                        }
-                        border.color: root.selectedIndex === 3 ? Theme.primary : "transparent"
-                        border.width: root.selectedIndex === 3 ? 2 : 0
-
-                        Column {
-                            anchors.centerIn: parent
-                            spacing: Theme.spacingS
-
-                            DankIcon {
-                                name: "lock"
-                                size: Theme.iconSize + 8
-                                color: Theme.surfaceText
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Lock")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-
-                            Rectangle {
-                                width: 20
-                                height: 16
-                                radius: 4
-                                color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.1)
-                                anchors.horizontalCenter: parent.horizontalCenter
-
-                                StyledText {
-                                    text: "L"
-                                    font.pixelSize: Theme.fontSizeSmall - 1
-                                    color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
-                                    font.weight: Font.Medium
-                                    anchors.centerIn: parent
-                                }
-                            }
-                        }
-
-                        MouseArea {
-                            id: lockArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                           root.selectedRow = 1
-                                           root.selectedCol = 0
-                                           selectOption("lock")
-                                       }
-                        }
-                    }
-
-                    Rectangle {
-                        id: suspendButton
-                        width: (parent.width - Theme.spacingS * 2) / 3
-                        height: 100
-                        radius: Theme.cornerRadius
-                        color: {
-                            if (root.selectedIndex === 4) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-                            } else if (suspendArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
-                            }
-                        }
-                        border.color: root.selectedIndex === 4 ? Theme.primary : "transparent"
-                        border.width: root.selectedIndex === 4 ? 2 : 0
-
-                        Column {
-                            anchors.centerIn: parent
-                            spacing: Theme.spacingS
-
-                            DankIcon {
-                                name: "bedtime"
-                                size: Theme.iconSize + 8
-                                color: Theme.surfaceText
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Suspend")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-
-                            Rectangle {
-                                width: 20
-                                height: 16
-                                radius: 4
-                                color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.1)
-                                anchors.horizontalCenter: parent.horizontalCenter
-
-                                StyledText {
-                                    text: "S"
-                                    font.pixelSize: Theme.fontSizeSmall - 1
-                                    color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
-                                    font.weight: Font.Medium
-                                    anchors.centerIn: parent
-                                }
-                            }
-                        }
-
-                        MouseArea {
-                            id: suspendArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                           root.selectedRow = 1
-                                           root.selectedCol = 1
-                                           selectOption("suspend")
-                                       }
-                        }
-                    }
-
-                    Rectangle {
-                        id: hibernateOrRestartButton
-                        width: (parent.width - Theme.spacingS * 2) / 3
-                        height: 100
-                        radius: Theme.cornerRadius
-                        color: {
-                            if (root.selectedIndex === 5) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-                            } else if (hibernateRestartArea.containsMouse) {
-                                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
-                            } else {
-                                return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.08)
-                            }
-                        }
-                        border.color: root.selectedIndex === 5 ? Theme.primary : "transparent"
-                        border.width: root.selectedIndex === 5 ? 2 : 0
-
-                        Column {
-                            anchors.centerIn: parent
-                            spacing: Theme.spacingS
-
-                            DankIcon {
-                                name: SessionService.hibernateSupported ? "ac_unit" : "refresh"
-                                size: Theme.iconSize + 8
-                                color: Theme.surfaceText
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-
-                            StyledText {
-                                text: SessionService.hibernateSupported ? I18n.tr("Hibernate") : I18n.tr("Restart")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-
-                            Rectangle {
-                                width: 20
-                                height: 16
-                                radius: 4
-                                color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.1)
-                                anchors.horizontalCenter: parent.horizontalCenter
-
-                                StyledText {
-                                    text: "H"
-                                    font.pixelSize: Theme.fontSizeSmall - 1
-                                    color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
-                                    font.weight: Font.Medium
-                                    anchors.centerIn: parent
-                                }
-                            }
-                        }
-
-                        MouseArea {
-                            id: hibernateRestartArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: () => {
-                                           root.selectedRow = 1
-                                           root.selectedCol = 2
-                                           selectOption(SessionService.hibernateSupported ? "hibernate" : "restart")
-                                       }
-                        }
-                    }
-                }
-
-                Item {
-                    height: Theme.spacingS
                 }
             }
         }

Modals/Settings/PowerSettings.qml

@@ -76,10 +76,10 @@ Item {
                         checked: SessionService.loginctlAvailable && SettingsData.loginctlLockIntegration
                         enabled: SessionService.loginctlAvailable
                         onToggled: checked => {
-                            if (SessionService.loginctlAvailable) {
+                                       if (SessionService.loginctlAvailable) {
-                                SettingsData.set("loginctlLockIntegration", checked)
+                                           SettingsData.set("loginctlLockIntegration", checked)
-                            }
+                                       }
-                        }
+                                   }
                     }
 
                     DankToggle {
@@ -185,16 +185,16 @@ Item {
                         }
 
                         onValueChanged: value => {
-                            const index = timeoutOptions.indexOf(value)
+                                            const index = timeoutOptions.indexOf(value)
-                            if (index >= 0) {
+                                            if (index >= 0) {
-                                const timeout = timeoutValues[index]
+                                                const timeout = timeoutValues[index]
-                                if (powerCategory.currentIndex === 0) {
+                                                if (powerCategory.currentIndex === 0) {
-                                    SettingsData.set("acLockTimeout", timeout)
+                                                    SettingsData.set("acLockTimeout", timeout)
-                                } else {
+                                                } else {
-                                    SettingsData.set("batteryLockTimeout", timeout)
+                                                    SettingsData.set("batteryLockTimeout", timeout)
-                                }
+                                                }
-                            }
+                                            }
-                        }
+                                        }
                     }
 
                     DankDropdown {
@@ -222,16 +222,16 @@ Item {
                         }
 
                         onValueChanged: value => {
-                            const index = timeoutOptions.indexOf(value)
+                                            const index = timeoutOptions.indexOf(value)
-                            if (index >= 0) {
+                                            if (index >= 0) {
-                                const timeout = timeoutValues[index]
+                                                const timeout = timeoutValues[index]
-                                if (powerCategory.currentIndex === 0) {
+                                                if (powerCategory.currentIndex === 0) {
-                                    SettingsData.set("acMonitorTimeout", timeout)
+                                                    SettingsData.set("acMonitorTimeout", timeout)
-                                } else {
+                                                } else {
-                                    SettingsData.set("batteryMonitorTimeout", timeout)
+                                                    SettingsData.set("batteryMonitorTimeout", timeout)
-                                }
+                                                }
-                            }
+                                            }
-                        }
+                                        }
                     }
 
                     DankDropdown {
@@ -259,16 +259,16 @@ Item {
                         }
 
                         onValueChanged: value => {
-                            const index = timeoutOptions.indexOf(value)
+                                            const index = timeoutOptions.indexOf(value)
-                            if (index >= 0) {
+                                            if (index >= 0) {
-                                const timeout = timeoutValues[index]
+                                                const timeout = timeoutValues[index]
-                                if (powerCategory.currentIndex === 0) {
+                                                if (powerCategory.currentIndex === 0) {
-                                    SettingsData.set("acSuspendTimeout", timeout)
+                                                    SettingsData.set("acSuspendTimeout", timeout)
-                                } else {
+                                                } else {
-                                    SettingsData.set("batterySuspendTimeout", timeout)
+                                                    SettingsData.set("batterySuspendTimeout", timeout)
-                                }
+                                                }
-                            }
+                                            }
-                        }
+                                        }
                     }
 
                     Column {
@@ -304,14 +304,14 @@ Item {
                             }
 
                             onSelectionChanged: (index, selected) => {
-                                if (selected) {
+                                                    if (selected) {
-                                    if (powerCategory.currentIndex === 0) {
+                                                        if (powerCategory.currentIndex === 0) {
-                                        SettingsData.set("acSuspendBehavior", index)
+                                                            SettingsData.set("acSuspendBehavior", index)
-                                    } else {
+                                                        } else {
-                                        SettingsData.set("batterySuspendBehavior", index)
+                                                            SettingsData.set("batterySuspendBehavior", index)
-                                    }
+                                                        }
-                                }
+                                                    }
-                            }
+                                                }
                         }
                     }
 
@@ -325,6 +325,185 @@ Item {
                 }
             }
 
+            StyledRect {
+                width: parent.width
+                height: powerMenuCustomSection.implicitHeight + Theme.spacingL * 2
+                radius: Theme.cornerRadius
+                color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
+                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
+                border.width: 0
+
+                Column {
+                    id: powerMenuCustomSection
+                    anchors.fill: parent
+                    anchors.margins: Theme.spacingL
+                    spacing: Theme.spacingM
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+
+                        DankIcon {
+                            name: "tune"
+                            size: Theme.iconSize
+                            color: Theme.primary
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        StyledText {
+                            text: I18n.tr("Power Menu Customization")
+                            font.pixelSize: Theme.fontSizeLarge
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+                    }
+
+                    StyledText {
+                        text: I18n.tr("Customize which actions appear in the power menu")
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceVariantText
+                        width: parent.width
+                        wrapMode: Text.Wrap
+                    }
+
+                    DankDropdown {
+                        id: defaultActionDropdown
+                        width: parent.width
+                        addHorizontalPadding: true
+                        text: I18n.tr("Default selected action")
+                        options: ["Reboot", "Log Out", "Power Off", "Lock", "Suspend", "Restart DMS", "Hibernate"]
+                        property var actionValues: ["reboot", "logout", "poweroff", "lock", "suspend", "restart", "hibernate"]
+
+                        Component.onCompleted: {
+                            const currentAction = SettingsData.powerMenuDefaultAction || "logout"
+                            const index = actionValues.indexOf(currentAction)
+                            currentValue = index >= 0 ? options[index] : "Log Out"
+                        }
+
+                        onValueChanged: value => {
+                                            const index = options.indexOf(value)
+                                            if (index >= 0) {
+                                                SettingsData.set("powerMenuDefaultAction", actionValues[index])
+                                            }
+                                        }
+                    }
+
+                    Column {
+                        width: parent.width
+                        spacing: Theme.spacingS
+
+                        DankToggle {
+                            width: parent.width
+                            text: I18n.tr("Show Reboot")
+                            checked: SettingsData.powerMenuActions.includes("reboot")
+                            onToggled: checked => {
+                                           let actions = [...SettingsData.powerMenuActions]
+                                           if (checked && !actions.includes("reboot")) {
+                                               actions.push("reboot")
+                                           } else if (!checked) {
+                                               actions = actions.filter(a => a !== "reboot")
+                                           }
+                                           SettingsData.set("powerMenuActions", actions)
+                                       }
+                        }
+
+                        DankToggle {
+                            width: parent.width
+                            text: I18n.tr("Show Log Out")
+                            checked: SettingsData.powerMenuActions.includes("logout")
+                            onToggled: checked => {
+                                           let actions = [...SettingsData.powerMenuActions]
+                                           if (checked && !actions.includes("logout")) {
+                                               actions.push("logout")
+                                           } else if (!checked) {
+                                               actions = actions.filter(a => a !== "logout")
+                                           }
+                                           SettingsData.set("powerMenuActions", actions)
+                                       }
+                        }
+
+                        DankToggle {
+                            width: parent.width
+                            text: I18n.tr("Show Power Off")
+                            checked: SettingsData.powerMenuActions.includes("poweroff")
+                            onToggled: checked => {
+                                           let actions = [...SettingsData.powerMenuActions]
+                                           if (checked && !actions.includes("poweroff")) {
+                                               actions.push("poweroff")
+                                           } else if (!checked) {
+                                               actions = actions.filter(a => a !== "poweroff")
+                                           }
+                                           SettingsData.set("powerMenuActions", actions)
+                                       }
+                        }
+
+                        DankToggle {
+                            width: parent.width
+                            text: I18n.tr("Show Lock")
+                            checked: SettingsData.powerMenuActions.includes("lock")
+                            onToggled: checked => {
+                                           let actions = [...SettingsData.powerMenuActions]
+                                           if (checked && !actions.includes("lock")) {
+                                               actions.push("lock")
+                                           } else if (!checked) {
+                                               actions = actions.filter(a => a !== "lock")
+                                           }
+                                           SettingsData.set("powerMenuActions", actions)
+                                       }
+                        }
+
+                        DankToggle {
+                            width: parent.width
+                            text: I18n.tr("Show Suspend")
+                            checked: SettingsData.powerMenuActions.includes("suspend")
+                            onToggled: checked => {
+                                           let actions = [...SettingsData.powerMenuActions]
+                                           if (checked && !actions.includes("suspend")) {
+                                               actions.push("suspend")
+                                           } else if (!checked) {
+                                               actions = actions.filter(a => a !== "suspend")
+                                           }
+                                           SettingsData.set("powerMenuActions", actions)
+                                       }
+                        }
+
+                        DankToggle {
+                            width: parent.width
+                            text: I18n.tr("Show Restart DMS")
+                            description: I18n.tr("Restart the DankMaterialShell")
+                            checked: SettingsData.powerMenuActions.includes("restart")
+                            onToggled: checked => {
+                                           let actions = [...SettingsData.powerMenuActions]
+                                           if (checked && !actions.includes("restart")) {
+                                               actions.push("restart")
+                                           } else if (!checked) {
+                                               actions = actions.filter(a => a !== "restart")
+                                           }
+                                           SettingsData.set("powerMenuActions", actions)
+                                       }
+                        }
+
+                        DankToggle {
+                            width: parent.width
+                            text: I18n.tr("Show Hibernate")
+                            description: I18n.tr("Only visible if hibernate is supported by your system")
+                            checked: SettingsData.powerMenuActions.includes("hibernate")
+                            visible: SessionService.hibernateSupported
+                            onToggled: checked => {
+                                           let actions = [...SettingsData.powerMenuActions]
+                                           if (checked && !actions.includes("hibernate")) {
+                                               actions.push("hibernate")
+                                           } else if (!checked) {
+                                               actions = actions.filter(a => a !== "hibernate")
+                                           }
+                                           SettingsData.set("powerMenuActions", actions)
+                                       }
+                        }
+                    }
+                }
+            }
+
             StyledRect {
                 width: parent.width
                 height: powerCommandConfirmSection.implicitHeight + Theme.spacingL * 2
@@ -425,12 +604,12 @@ Item {
 
                             Component.onCompleted: {
                                 if (SettingsData.customPowerActionLock) {
-                                    text = SettingsData.customPowerActionLock;
+                                    text = SettingsData.customPowerActionLock
                                 }
                             }
 
                             onTextEdited: {
-                                SettingsData.set("customPowerActionLock", text.trim());
+                                SettingsData.set("customPowerActionLock", text.trim())
                             }
                         }
                     }
@@ -457,12 +636,12 @@ Item {
 
                             Component.onCompleted: {
                                 if (SettingsData.customPowerActionLogout) {
-                                    text = SettingsData.customPowerActionLogout;
+                                    text = SettingsData.customPowerActionLogout
                                 }
                             }
 
                             onTextEdited: {
-                                SettingsData.set("customPowerActionLogout", text.trim());
+                                SettingsData.set("customPowerActionLogout", text.trim())
                             }
                         }
                     }
@@ -489,12 +668,12 @@ Item {
 
                             Component.onCompleted: {
                                 if (SettingsData.customPowerActionSuspend) {
-                                    text = SettingsData.customPowerActionSuspend;
+                                    text = SettingsData.customPowerActionSuspend
                                 }
                             }
 
                             onTextEdited: {
-                                SettingsData.set("customPowerActionSuspend", text.trim());
+                                SettingsData.set("customPowerActionSuspend", text.trim())
                             }
                         }
                     }
@@ -521,12 +700,12 @@ Item {
 
                             Component.onCompleted: {
                                 if (SettingsData.customPowerActionHibernate) {
-                                    text = SettingsData.customPowerActionHibernate;
+                                    text = SettingsData.customPowerActionHibernate
                                 }
                             }
 
                             onTextEdited: {
-                                SettingsData.set("customPowerActionHibernate", text.trim());
+                                SettingsData.set("customPowerActionHibernate", text.trim())
                             }
                         }
                     }
@@ -553,12 +732,12 @@ Item {
 
                             Component.onCompleted: {
                                 if (SettingsData.customPowerActionReboot) {
-                                    text = SettingsData.customPowerActionReboot;
+                                    text = SettingsData.customPowerActionReboot
                                 }
                             }
 
                             onTextEdited: {
-                                SettingsData.set("customPowerActionReboot", text.trim());
+                                SettingsData.set("customPowerActionReboot", text.trim())
                             }
                         }
                     }
@@ -585,12 +764,12 @@ Item {
 
                             Component.onCompleted: {
                                 if (SettingsData.customPowerActionPowerOff) {
-                                    text = SettingsData.customPowerActionPowerOff;
+                                    text = SettingsData.customPowerActionPowerOff
                                 }
                             }
 
                             onTextEdited: {
-                                SettingsData.set("customPowerActionPowerOff", text.trim());
+                                SettingsData.set("customPowerActionPowerOff", text.trim())
                             }
                         }
                     }

translations/en.json

@@ -212,31 +212,31 @@
   {
     "term": "Are you sure you want to hibernate the system?",
     "context": "Are you sure you want to hibernate the system?",
-    "reference": "Modals/PowerMenuModal.qml:64",
+    "reference": "Modals/PowerMenuModal.qml:158",
     "comment": ""
   },
   {
     "term": "Are you sure you want to log out?",
     "context": "Are you sure you want to log out?",
-    "reference": "Modals/PowerMenuModal.qml:56",
+    "reference": "Modals/PowerMenuModal.qml:150",
     "comment": ""
   },
   {
     "term": "Are you sure you want to power off the system?",
     "context": "Are you sure you want to power off the system?",
-    "reference": "Modals/PowerMenuModal.qml:72",
+    "reference": "Modals/PowerMenuModal.qml:166",
     "comment": ""
   },
   {
     "term": "Are you sure you want to reboot the system?",
     "context": "Are you sure you want to reboot the system?",
-    "reference": "Modals/PowerMenuModal.qml:68",
+    "reference": "Modals/PowerMenuModal.qml:162",
     "comment": ""
   },
   {
     "term": "Are you sure you want to suspend the system?",
     "context": "Are you sure you want to suspend the system?",
-    "reference": "Modals/PowerMenuModal.qml:60",
+    "reference": "Modals/PowerMenuModal.qml:154",
     "comment": ""
   },
   {
@@ -728,37 +728,37 @@
   {
     "term": "Command or script to run instead of the standard hibernate procedure",
     "context": "Command or script to run instead of the standard hibernate procedure",
-    "reference": "Modals/Settings/PowerSettings.qml:508",
+    "reference": "Modals/Settings/PowerSettings.qml:687",
     "comment": ""
   },
   {
     "term": "Command or script to run instead of the standard lock procedure",
     "context": "Command or script to run instead of the standard lock procedure",
-    "reference": "Modals/Settings/PowerSettings.qml:412",
+    "reference": "Modals/Settings/PowerSettings.qml:591",
     "comment": ""
   },
   {
     "term": "Command or script to run instead of the standard logout procedure",
     "context": "Command or script to run instead of the standard logout procedure",
-    "reference": "Modals/Settings/PowerSettings.qml:444",
+    "reference": "Modals/Settings/PowerSettings.qml:623",
     "comment": ""
   },
   {
     "term": "Command or script to run instead of the standard power off procedure",
     "context": "Command or script to run instead of the standard power off procedure",
-    "reference": "Modals/Settings/PowerSettings.qml:572",
+    "reference": "Modals/Settings/PowerSettings.qml:751",
     "comment": ""
   },
   {
     "term": "Command or script to run instead of the standard reboot procedure",
     "context": "Command or script to run instead of the standard reboot procedure",
-    "reference": "Modals/Settings/PowerSettings.qml:540",
+    "reference": "Modals/Settings/PowerSettings.qml:719",
     "comment": ""
   },
   {
     "term": "Command or script to run instead of the standard suspend procedure",
     "context": "Command or script to run instead of the standard suspend procedure",
-    "reference": "Modals/Settings/PowerSettings.qml:476",
+    "reference": "Modals/Settings/PowerSettings.qml:655",
     "comment": ""
   },
   {
@@ -974,7 +974,7 @@
   {
     "term": "Custom Power Actions",
     "context": "Custom Power Actions",
-    "reference": "Modals/Settings/PowerSettings.qml:398",
+    "reference": "Modals/Settings/PowerSettings.qml:577",
     "comment": ""
   },
   {
@@ -995,6 +995,12 @@
     "reference": "Modules/Settings/DankBarTab.qml:151",
     "comment": ""
   },
+  {
+    "term": "Customize which actions appear in the power menu",
+    "context": "Customize which actions appear in the power menu",
+    "reference": "Modals/Settings/PowerSettings.qml:363",
+    "comment": ""
+  },
   {
     "term": "DEMO MODE - Click anywhere to exit",
     "context": "DEMO MODE - Click anywhere to exit",
@@ -1091,6 +1097,12 @@
     "reference": "Modules/Settings/LauncherTab.qml:202",
     "comment": ""
   },
+  {
+    "term": "Default selected action",
+    "context": "Default selected action",
+    "reference": "Modals/Settings/PowerSettings.qml:374",
+    "comment": ""
+  },
   {
     "term": "Defaults",
     "context": "Defaults",
@@ -1754,7 +1766,7 @@
   {
     "term": "Hibernate",
     "context": "Hibernate",
-    "reference": "Modals/PowerMenuModal.qml:63, Modals/PowerMenuModal.qml:555, Modules/Lock/LockPowerMenu.qml:312",
+    "reference": "Modals/PowerMenuModal.qml:117, Modals/PowerMenuModal.qml:157, Modules/Lock/LockPowerMenu.qml:312",
     "comment": ""
   },
   {
@@ -2048,7 +2060,7 @@
   {
     "term": "Lock",
     "context": "Lock",
-    "reference": "Modals/PowerMenuModal.qml:423",
+    "reference": "Modals/PowerMenuModal.qml:105",
     "comment": ""
   },
   {
@@ -2072,7 +2084,7 @@
   {
     "term": "Log Out",
     "context": "Log Out",
-    "reference": "Modals/PowerMenuModal.qml:55, Modals/PowerMenuModal.qml:291, Modules/Lock/LockPowerMenu.qml:209, Modules/ControlCenter/PowerMenu.qml:14",
+    "reference": "Modals/PowerMenuModal.qml:93, Modals/PowerMenuModal.qml:149, Modules/Lock/LockPowerMenu.qml:209, Modules/ControlCenter/PowerMenu.qml:14",
     "comment": ""
   },
   {
@@ -2585,6 +2597,12 @@
     "reference": "Modules/Settings/DisplaysTab.qml:200",
     "comment": ""
   },
+  {
+    "term": "Only visible if hibernate is supported by your system",
+    "context": "Only visible if hibernate is supported by your system",
+    "reference": "Modals/Settings/PowerSettings.qml:490",
+    "comment": ""
+  },
   {
     "term": "Opacity",
     "context": "Opacity",
@@ -2840,13 +2858,19 @@
   {
     "term": "Power Action Confirmation",
     "context": "Power Action Confirmation",
+    "reference": "Modals/Settings/PowerSettings.qml:533",
+    "comment": ""
+  },
+  {
+    "term": "Power Menu Customization",
+    "context": "Power Menu Customization",
     "reference": "Modals/Settings/PowerSettings.qml:354",
     "comment": ""
   },
   {
     "term": "Power Off",
     "context": "Power Off",
-    "reference": "Modals/PowerMenuModal.qml:71, Modals/PowerMenuModal.qml:357, Modules/Lock/LockPowerMenu.qml:432, Modules/ControlCenter/PowerMenu.qml:17",
+    "reference": "Modals/PowerMenuModal.qml:99, Modals/PowerMenuModal.qml:165, Modules/Lock/LockPowerMenu.qml:432, Modules/ControlCenter/PowerMenu.qml:17",
     "comment": ""
   },
   {
@@ -2978,7 +3002,7 @@
   {
     "term": "Reboot",
     "context": "Reboot",
-    "reference": "Modals/PowerMenuModal.qml:67, Modals/PowerMenuModal.qml:225, Modules/Lock/LockPowerMenu.qml:372, Modules/ControlCenter/PowerMenu.qml:16",
+    "reference": "Modals/PowerMenuModal.qml:87, Modals/PowerMenuModal.qml:161, Modules/Lock/LockPowerMenu.qml:372, Modules/ControlCenter/PowerMenu.qml:16",
     "comment": ""
   },
   {
@@ -3020,7 +3044,7 @@
   {
     "term": "Request confirmation on power off, restart, suspend, hibernate and logout actions",
     "context": "Request confirmation on power off, restart, suspend, hibernate and logout actions",
-    "reference": "Modals/Settings/PowerSettings.qml:365",
+    "reference": "Modals/Settings/PowerSettings.qml:544",
     "comment": ""
   },
   {
@@ -3036,9 +3060,15 @@
     "comment": ""
   },
   {
-    "term": "Restart",
+    "term": "Restart DMS",
-    "context": "Restart",
+    "context": "Restart DMS",
-    "reference": "Modals/PowerMenuModal.qml:555",
+    "reference": "Modals/PowerMenuModal.qml:123",
+    "comment": ""
+  },
+  {
+    "term": "Restart the DankMaterialShell",
+    "context": "Restart the DankMaterialShell",
+    "reference": "Modals/Settings/PowerSettings.qml:474",
     "comment": ""
   },
   {
@@ -3290,7 +3320,7 @@
   {
     "term": "Show Confirmation on Power Actions",
     "context": "Show Confirmation on Power Actions",
-    "reference": "Modals/Settings/PowerSettings.qml:364",
+    "reference": "Modals/Settings/PowerSettings.qml:543",
     "comment": ""
   },
   {
@@ -3299,18 +3329,60 @@
     "reference": "Modules/Settings/DockTab.qml:128",
     "comment": ""
   },
+  {
+    "term": "Show Hibernate",
+    "context": "Show Hibernate",
+    "reference": "Modals/Settings/PowerSettings.qml:489",
+    "comment": ""
+  },
   {
     "term": "Show Line Numbers",
     "context": "Show Line Numbers",
     "reference": "Modules/Notepad/NotepadSettings.qml:151",
     "comment": ""
   },
+  {
+    "term": "Show Lock",
+    "context": "Show Lock",
+    "reference": "Modals/Settings/PowerSettings.qml:443",
+    "comment": ""
+  },
+  {
+    "term": "Show Log Out",
+    "context": "Show Log Out",
+    "reference": "Modals/Settings/PowerSettings.qml:413",
+    "comment": ""
+  },
   {
     "term": "Show Power Actions",
     "context": "Show Power Actions",
     "reference": "Modals/Settings/PowerSettings.qml:57",
     "comment": ""
   },
+  {
+    "term": "Show Power Off",
+    "context": "Show Power Off",
+    "reference": "Modals/Settings/PowerSettings.qml:428",
+    "comment": ""
+  },
+  {
+    "term": "Show Reboot",
+    "context": "Show Reboot",
+    "reference": "Modals/Settings/PowerSettings.qml:398",
+    "comment": ""
+  },
+  {
+    "term": "Show Restart DMS",
+    "context": "Show Restart DMS",
+    "reference": "Modals/Settings/PowerSettings.qml:473",
+    "comment": ""
+  },
+  {
+    "term": "Show Suspend",
+    "context": "Show Suspend",
+    "reference": "Modals/Settings/PowerSettings.qml:458",
+    "comment": ""
+  },
   {
     "term": "Show Workspace Apps",
     "context": "Show Workspace Apps",
@@ -3524,7 +3596,7 @@
   {
     "term": "Suspend",
     "context": "Suspend",
-    "reference": "Modals/PowerMenuModal.qml:59, Modals/PowerMenuModal.qml:489, Modules/Lock/LockPowerMenu.qml:260, Modules/ControlCenter/PowerMenu.qml:15",
+    "reference": "Modals/PowerMenuModal.qml:111, Modals/PowerMenuModal.qml:153, Modules/Lock/LockPowerMenu.qml:260, Modules/ControlCenter/PowerMenu.qml:15",
     "comment": ""
   },
   {

translations/poexports/it.json

@@ -497,6 +497,9 @@
   "Customizable empty space": {
     "Customizable empty space": "Spazio vuoto personalizzabile"
   },
+  "Customize which actions appear in the power menu": {
+    "Customize which actions appear in the power menu": ""
+  },
   "DEMO MODE - Click anywhere to exit": {
     "DEMO MODE - Click anywhere to exit": "DEMO MODE - Clicca ovunque per uscire"
   },
@@ -545,6 +548,9 @@
   "Default": {
     "Default": "Predefinito"
   },
+  "Default selected action": {
+    "Default selected action": ""
+  },
   "Defaults": {
     "Defaults": "Predefiniti"
   },
@@ -1292,6 +1298,9 @@
   "Only adjust gamma based on time or location rules.": {
     "Only adjust gamma based on time or location rules.": "Regolare gamma solo in base alle regole di tempo o di posizione."
   },
+  "Only visible if hibernate is supported by your system": {
+    "Only visible if hibernate is supported by your system": ""
+  },
   "Opacity": {
     "Opacity": "Opacità"
   },
@@ -1421,6 +1430,9 @@
   "Power Action Confirmation": {
     "Power Action Confirmation": "Conferma Azioni Alimentazione"
   },
+  "Power Menu Customization": {
+    "Power Menu Customization": ""
+  },
   "Power Off": {
     "Power Off": "Spegni"
   },
@@ -1520,6 +1532,12 @@
   "Restart": {
     "Restart": ""
   },
+  "Restart DMS": {
+    "Restart DMS": ""
+  },
+  "Restart the DankMaterialShell": {
+    "Restart the DankMaterialShell": ""
+  },
   "Resume": {
     "Resume": "Riprendi"
   },
@@ -1649,12 +1667,33 @@
   "Show Dock": {
     "Show Dock": "Mostra Dock"
   },
+  "Show Hibernate": {
+    "Show Hibernate": ""
+  },
   "Show Line Numbers": {
     "Show Line Numbers": "Mostra Numero Righe"
   },
+  "Show Lock": {
+    "Show Lock": ""
+  },
+  "Show Log Out": {
+    "Show Log Out": ""
+  },
   "Show Power Actions": {
     "Show Power Actions": "Mostra Azioni Alimentazione"
   },
+  "Show Power Off": {
+    "Show Power Off": ""
+  },
+  "Show Reboot": {
+    "Show Reboot": ""
+  },
+  "Show Restart DMS": {
+    "Show Restart DMS": ""
+  },
+  "Show Suspend": {
+    "Show Suspend": ""
+  },
   "Show Workspace Apps": {
     "Show Workspace Apps": "Mostra Apps Workspace"
   },

translations/poexports/ja.json

@@ -497,6 +497,9 @@
   "Customizable empty space": {
     "Customizable empty space": "カスタマイズ可能な空きスペース"
   },
+  "Customize which actions appear in the power menu": {
+    "Customize which actions appear in the power menu": ""
+  },
   "DEMO MODE - Click anywhere to exit": {
     "DEMO MODE - Click anywhere to exit": "デモモード -任意の場所をクリックして 終了"
   },
@@ -545,6 +548,9 @@
   "Default": {
     "Default": "デフォルト"
   },
+  "Default selected action": {
+    "Default selected action": ""
+  },
   "Defaults": {
     "Defaults": "デフォルト"
   },
@@ -1023,7 +1029,7 @@
     "Location Search": "ロケーション検索"
   },
   "Lock": {
-    "Lock": ""
+    "Lock": "ロック"
   },
   "Lock Screen": {
     "Lock Screen": "ロック画面"
@@ -1292,6 +1298,9 @@
   "Only adjust gamma based on time or location rules.": {
     "Only adjust gamma based on time or location rules.": "ガンマは、時間または場所のルールに基づいてのみ調整します。"
   },
+  "Only visible if hibernate is supported by your system": {
+    "Only visible if hibernate is supported by your system": ""
+  },
   "Opacity": {
     "Opacity": "不透明度"
   },
@@ -1421,6 +1430,9 @@
   "Power Action Confirmation": {
     "Power Action Confirmation": "電源アクションの確認"
   },
+  "Power Menu Customization": {
+    "Power Menu Customization": ""
+  },
   "Power Off": {
     "Power Off": "電源オフ"
   },
@@ -1518,7 +1530,13 @@
     "Resources": "リソース"
   },
   "Restart": {
-    "Restart": ""
+    "Restart": "再起動"
+  },
+  "Restart DMS": {
+    "Restart DMS": ""
+  },
+  "Restart the DankMaterialShell": {
+    "Restart the DankMaterialShell": ""
   },
   "Resume": {
     "Resume": "レジュメ"
@@ -1649,12 +1667,33 @@
   "Show Dock": {
     "Show Dock": "ドックを表示"
   },
+  "Show Hibernate": {
+    "Show Hibernate": ""
+  },
   "Show Line Numbers": {
     "Show Line Numbers": "行番号を表示"
   },
+  "Show Lock": {
+    "Show Lock": ""
+  },
+  "Show Log Out": {
+    "Show Log Out": ""
+  },
   "Show Power Actions": {
     "Show Power Actions": "電源アクションを表示"
   },
+  "Show Power Off": {
+    "Show Power Off": ""
+  },
+  "Show Reboot": {
+    "Show Reboot": ""
+  },
+  "Show Restart DMS": {
+    "Show Restart DMS": ""
+  },
+  "Show Suspend": {
+    "Show Suspend": ""
+  },
   "Show Workspace Apps": {
     "Show Workspace Apps": "ワークスペースアプリを表示"
   },

translations/poexports/pl.json

@@ -497,6 +497,9 @@
   "Customizable empty space": {
     "Customizable empty space": "Dostosowywalna pusta przestrzeń"
   },
+  "Customize which actions appear in the power menu": {
+    "Customize which actions appear in the power menu": ""
+  },
   "DEMO MODE - Click anywhere to exit": {
     "DEMO MODE - Click anywhere to exit": "TRYB DEMO - Kliknij gdziekolwiek aby wyjść"
   },
@@ -545,6 +548,9 @@
   "Default": {
     "Default": "Domyślne"
   },
+  "Default selected action": {
+    "Default selected action": ""
+  },
   "Defaults": {
     "Defaults": "Domyślne"
   },
@@ -1292,6 +1298,9 @@
   "Only adjust gamma based on time or location rules.": {
     "Only adjust gamma based on time or location rules.": "Dostosuj gamma tylko na podstawie reguł czasu lub lokalizacji."
   },
+  "Only visible if hibernate is supported by your system": {
+    "Only visible if hibernate is supported by your system": ""
+  },
   "Opacity": {
     "Opacity": "Przezroczystość"
   },
@@ -1421,6 +1430,9 @@
   "Power Action Confirmation": {
     "Power Action Confirmation": "Potwierdzenie działania zasilania"
   },
+  "Power Menu Customization": {
+    "Power Menu Customization": ""
+  },
   "Power Off": {
     "Power Off": "Wyłącz komputer"
   },
@@ -1520,6 +1532,12 @@
   "Restart": {
     "Restart": ""
   },
+  "Restart DMS": {
+    "Restart DMS": ""
+  },
+  "Restart the DankMaterialShell": {
+    "Restart the DankMaterialShell": ""
+  },
   "Resume": {
     "Resume": "Wznów"
   },
@@ -1649,12 +1667,33 @@
   "Show Dock": {
     "Show Dock": "Pokaż dok"
   },
+  "Show Hibernate": {
+    "Show Hibernate": ""
+  },
   "Show Line Numbers": {
     "Show Line Numbers": "Pokaż numery wierszy"
   },
+  "Show Lock": {
+    "Show Lock": ""
+  },
+  "Show Log Out": {
+    "Show Log Out": ""
+  },
   "Show Power Actions": {
     "Show Power Actions": "Pokaż akcje zasilania"
   },
+  "Show Power Off": {
+    "Show Power Off": ""
+  },
+  "Show Reboot": {
+    "Show Reboot": ""
+  },
+  "Show Restart DMS": {
+    "Show Restart DMS": ""
+  },
+  "Show Suspend": {
+    "Show Suspend": ""
+  },
   "Show Workspace Apps": {
     "Show Workspace Apps": "Pokaż aplikacje z obszaru roboczego"
   },

translations/poexports/pt.json

@@ -497,6 +497,9 @@
   "Customizable empty space": {
     "Customizable empty space": "Espaço vazio customizável"
   },
+  "Customize which actions appear in the power menu": {
+    "Customize which actions appear in the power menu": ""
+  },
   "DEMO MODE - Click anywhere to exit": {
     "DEMO MODE - Click anywhere to exit": "MODO DEMONSTRAÇÃO - Clique em qualquer lugar para sair"
   },
@@ -545,6 +548,9 @@
   "Default": {
     "Default": "Padrão"
   },
+  "Default selected action": {
+    "Default selected action": ""
+  },
   "Defaults": {
     "Defaults": "Padrões"
   },
@@ -1292,6 +1298,9 @@
   "Only adjust gamma based on time or location rules.": {
     "Only adjust gamma based on time or location rules.": "Apenas ajustar gama baseada em regras de tempo ou localização."
   },
+  "Only visible if hibernate is supported by your system": {
+    "Only visible if hibernate is supported by your system": ""
+  },
   "Opacity": {
     "Opacity": "Opacidade"
   },
@@ -1421,6 +1430,9 @@
   "Power Action Confirmation": {
     "Power Action Confirmation": "Confirmação de Ação de Energia"
   },
+  "Power Menu Customization": {
+    "Power Menu Customization": ""
+  },
   "Power Off": {
     "Power Off": "Desligar"
   },
@@ -1520,6 +1532,12 @@
   "Restart": {
     "Restart": ""
   },
+  "Restart DMS": {
+    "Restart DMS": ""
+  },
+  "Restart the DankMaterialShell": {
+    "Restart the DankMaterialShell": ""
+  },
   "Resume": {
     "Resume": ""
   },
@@ -1649,12 +1667,33 @@
   "Show Dock": {
     "Show Dock": "Mostrar Dock"
   },
+  "Show Hibernate": {
+    "Show Hibernate": ""
+  },
   "Show Line Numbers": {
     "Show Line Numbers": "Mostrar Numeração de Linha"
   },
+  "Show Lock": {
+    "Show Lock": ""
+  },
+  "Show Log Out": {
+    "Show Log Out": ""
+  },
   "Show Power Actions": {
     "Show Power Actions": "Mostrar Ações de Energia"
   },
+  "Show Power Off": {
+    "Show Power Off": ""
+  },
+  "Show Reboot": {
+    "Show Reboot": ""
+  },
+  "Show Restart DMS": {
+    "Show Restart DMS": ""
+  },
+  "Show Suspend": {
+    "Show Suspend": ""
+  },
   "Show Workspace Apps": {
     "Show Workspace Apps": "Mostrar Aplicativos da Área de Trabalho Virtual"
   },

translations/poexports/tr.json

@@ -497,6 +497,9 @@
   "Customizable empty space": {
     "Customizable empty space": "Özelleştirilebilir boş alan"
   },
+  "Customize which actions appear in the power menu": {
+    "Customize which actions appear in the power menu": ""
+  },
   "DEMO MODE - Click anywhere to exit": {
     "DEMO MODE - Click anywhere to exit": "DEMO MODU - Çıkmak için herhangi bir yere tıklayın"
   },
@@ -545,6 +548,9 @@
   "Default": {
     "Default": "Varsayılan"
   },
+  "Default selected action": {
+    "Default selected action": ""
+  },
   "Defaults": {
     "Defaults": "Varsayılanlar"
   },
@@ -1023,7 +1029,7 @@
     "Location Search": "Konum Arama"
   },
   "Lock": {
-    "Lock": ""
+    "Lock": "Kilitle"
   },
   "Lock Screen": {
     "Lock Screen": "Kilit Ekranı"
@@ -1292,6 +1298,9 @@
   "Only adjust gamma based on time or location rules.": {
     "Only adjust gamma based on time or location rules.": "Gamayı yalnızca zaman veya konum kurallarına göre ayarlayın."
   },
+  "Only visible if hibernate is supported by your system": {
+    "Only visible if hibernate is supported by your system": ""
+  },
   "Opacity": {
     "Opacity": "Opaklık"
   },
@@ -1421,6 +1430,9 @@
   "Power Action Confirmation": {
     "Power Action Confirmation": "Güç Eylemi Onayı"
   },
+  "Power Menu Customization": {
+    "Power Menu Customization": ""
+  },
   "Power Off": {
     "Power Off": "Kapat"
   },
@@ -1518,7 +1530,13 @@
     "Resources": "Kaynaklar"
   },
   "Restart": {
-    "Restart": ""
+    "Restart": "Yeniden Başlat"
+  },
+  "Restart DMS": {
+    "Restart DMS": ""
+  },
+  "Restart the DankMaterialShell": {
+    "Restart the DankMaterialShell": ""
   },
   "Resume": {
     "Resume": "Sürdür"
@@ -1649,12 +1667,33 @@
   "Show Dock": {
     "Show Dock": "Dock'u Göster"
   },
+  "Show Hibernate": {
+    "Show Hibernate": ""
+  },
   "Show Line Numbers": {
     "Show Line Numbers": "Satır Numaralarını Göster"
   },
+  "Show Lock": {
+    "Show Lock": ""
+  },
+  "Show Log Out": {
+    "Show Log Out": ""
+  },
   "Show Power Actions": {
     "Show Power Actions": "Güç Eylemlerini Göster"
   },
+  "Show Power Off": {
+    "Show Power Off": ""
+  },
+  "Show Reboot": {
+    "Show Reboot": ""
+  },
+  "Show Restart DMS": {
+    "Show Restart DMS": ""
+  },
+  "Show Suspend": {
+    "Show Suspend": ""
+  },
   "Show Workspace Apps": {
     "Show Workspace Apps": "Çalışma Alanı Uygulamalarını Göster"
   },

translations/poexports/zh_CN.json

@@ -497,6 +497,9 @@
   "Customizable empty space": {
     "Customizable empty space": "可调节留白"
   },
+  "Customize which actions appear in the power menu": {
+    "Customize which actions appear in the power menu": ""
+  },
   "DEMO MODE - Click anywhere to exit": {
     "DEMO MODE - Click anywhere to exit": "演示模式 - 点击任意位置退出"
   },
@@ -545,6 +548,9 @@
   "Default": {
     "Default": "默认"
   },
+  "Default selected action": {
+    "Default selected action": ""
+  },
   "Defaults": {
     "Defaults": "复位"
   },
@@ -1292,6 +1298,9 @@
   "Only adjust gamma based on time or location rules.": {
     "Only adjust gamma based on time or location rules.": "根据时间或位置调节伽马值。"
   },
+  "Only visible if hibernate is supported by your system": {
+    "Only visible if hibernate is supported by your system": ""
+  },
   "Opacity": {
     "Opacity": "不透明度"
   },
@@ -1421,6 +1430,9 @@
   "Power Action Confirmation": {
     "Power Action Confirmation": "电源操作确认"
   },
+  "Power Menu Customization": {
+    "Power Menu Customization": ""
+  },
   "Power Off": {
     "Power Off": "关机"
   },
@@ -1520,6 +1532,12 @@
   "Restart": {
     "Restart": "重启"
   },
+  "Restart DMS": {
+    "Restart DMS": ""
+  },
+  "Restart the DankMaterialShell": {
+    "Restart the DankMaterialShell": ""
+  },
   "Resume": {
     "Resume": "恢复"
   },
@@ -1649,12 +1667,33 @@
   "Show Dock": {
     "Show Dock": "显示程序坞"
   },
+  "Show Hibernate": {
+    "Show Hibernate": ""
+  },
   "Show Line Numbers": {
     "Show Line Numbers": "显示行号"
   },
+  "Show Lock": {
+    "Show Lock": ""
+  },
+  "Show Log Out": {
+    "Show Log Out": ""
+  },
   "Show Power Actions": {
     "Show Power Actions": "显示电源操作"
   },
+  "Show Power Off": {
+    "Show Power Off": ""
+  },
+  "Show Reboot": {
+    "Show Reboot": ""
+  },
+  "Show Restart DMS": {
+    "Show Restart DMS": ""
+  },
+  "Show Suspend": {
+    "Show Suspend": ""
+  },
   "Show Workspace Apps": {
     "Show Workspace Apps": "显示工作区内应用"
   },

translations/poexports/zh_TW.json

@@ -497,6 +497,9 @@
   "Customizable empty space": {
     "Customizable empty space": "可自訂空白空間"
   },
+  "Customize which actions appear in the power menu": {
+    "Customize which actions appear in the power menu": ""
+  },
   "DEMO MODE - Click anywhere to exit": {
     "DEMO MODE - Click anywhere to exit": "演示模式 - 點擊任意處關閉"
   },
@@ -545,6 +548,9 @@
   "Default": {
     "Default": "預設"
   },
+  "Default selected action": {
+    "Default selected action": ""
+  },
   "Defaults": {
     "Defaults": "預設"
   },
@@ -1292,6 +1298,9 @@
   "Only adjust gamma based on time or location rules.": {
     "Only adjust gamma based on time or location rules.": "僅根據時間或位置規則調整 gamma。"
   },
+  "Only visible if hibernate is supported by your system": {
+    "Only visible if hibernate is supported by your system": ""
+  },
   "Opacity": {
     "Opacity": "不透明度"
   },
@@ -1421,6 +1430,9 @@
   "Power Action Confirmation": {
     "Power Action Confirmation": "電源操作確認"
   },
+  "Power Menu Customization": {
+    "Power Menu Customization": ""
+  },
   "Power Off": {
     "Power Off": "關機"
   },
@@ -1520,6 +1532,12 @@
   "Restart": {
     "Restart": ""
   },
+  "Restart DMS": {
+    "Restart DMS": ""
+  },
+  "Restart the DankMaterialShell": {
+    "Restart the DankMaterialShell": ""
+  },
   "Resume": {
     "Resume": ""
   },
@@ -1649,12 +1667,33 @@
   "Show Dock": {
     "Show Dock": "顯示 Dock"
   },
+  "Show Hibernate": {
+    "Show Hibernate": ""
+  },
   "Show Line Numbers": {
     "Show Line Numbers": "顯示行數"
   },
+  "Show Lock": {
+    "Show Lock": ""
+  },
+  "Show Log Out": {
+    "Show Log Out": ""
+  },
   "Show Power Actions": {
     "Show Power Actions": "顯示電源選項"
   },
+  "Show Power Off": {
+    "Show Power Off": ""
+  },
+  "Show Reboot": {
+    "Show Reboot": ""
+  },
+  "Show Restart DMS": {
+    "Show Restart DMS": ""
+  },
+  "Show Suspend": {
+    "Show Suspend": ""
+  },
   "Show Workspace Apps": {
     "Show Workspace Apps": "顯示工作區應用程式"
   },

translations/template.json

@@ -1161,6 +1161,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Customize which actions appear in the power menu",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "DEMO MODE - Click anywhere to exit",
     "translation": "",
@@ -1273,6 +1280,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Default selected action",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Defaults",
     "translation": "",
@@ -3016,6 +3030,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Only visible if hibernate is supported by your system",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Opacity",
     "translation": "",
@@ -3317,6 +3338,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Power Menu Customization",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Power Off",
     "translation": "",
@@ -3542,7 +3570,14 @@
     "comment": ""
   },
   {
-    "term": "Restart",
+    "term": "Restart DMS",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
+  {
+    "term": "Restart the DankMaterialShell",
     "translation": "",
     "context": "",
     "reference": "",
@@ -3849,6 +3884,13 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Show Hibernate",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Show Line Numbers",
     "translation": "",
@@ -3856,6 +3898,20 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Show Lock",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
+  {
+    "term": "Show Log Out",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Show Power Actions",
     "translation": "",
@@ -3863,6 +3919,34 @@
     "reference": "",
     "comment": ""
   },
+  {
+    "term": "Show Power Off",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
+  {
+    "term": "Show Reboot",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
+  {
+    "term": "Show Restart DMS",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
+  {
+    "term": "Show Suspend",
+    "translation": "",
+    "context": "",
+    "reference": "",
+    "comment": ""
+  },
   {
     "term": "Show Workspace Apps",
     "translation": "",