mirror of
https://invent.kde.org/plasma/plasma-desktop.git
synced 2026-11-03 14:49:44 -09:00
kcms/ksmserver: Match logout preview active screen behavior
Now the logout screen's interactive controls are displayed only on the active screen and follow the pointer when it moves between screens, matching the behavior of the lock screen. ENHANCEMENT: 431382 FIXED-IN: 6.8.0
This commit is contained in:
Ramil Nurmanov
Nate Graham
parent
15693242ad
commit
18cd295a21
5 changed files with 348 additions and 259 deletions
|
|
@ -44,19 +44,19 @@ class LogoutGreeterTests(unittest.TestCase):
|
|||
self.assertEqual(expected, outLines[(len(outLines) - 1)].decode('UTF-8'))
|
||||
|
||||
def test_sleep(self):
|
||||
self.driver.find_element(AppiumBy.XPATH, "//button[contains(@name, 'Slee') and contains(@accessibility-id, 'LogoutButton')]").click()
|
||||
self.driver.find_element(AppiumBy.XPATH, "//button[contains(@name, 'Slee') and contains(@accessibility-id, 'suspendButton')]").click()
|
||||
self.assertStdOutLine("suspend")
|
||||
|
||||
def test_hibernate(self):
|
||||
self.driver.find_element(AppiumBy.XPATH, "//button[contains(@name, 'Hibernate') and contains(@accessibility-id, 'LogoutButton')]").click()
|
||||
self.driver.find_element(AppiumBy.XPATH, "//button[contains(@name, 'Hibernate') and contains(@accessibility-id, 'hibernateButton')]").click()
|
||||
self.assertStdOutLine("hibernate")
|
||||
|
||||
def test_restart(self):
|
||||
self.driver.find_element(AppiumBy.XPATH, "//button[contains(@name, 'Restart') and contains(@accessibility-id, 'LogoutButton')]").click()
|
||||
self.driver.find_element(AppiumBy.XPATH, "//button[contains(@name, 'Restart') and contains(@accessibility-id, 'rebootButton')]").click()
|
||||
self.assertStdOutLine("reboot")
|
||||
|
||||
def test_shutdown(self):
|
||||
self.driver.find_element(AppiumBy.XPATH, "//button[contains(@name, 'Shut Down') and contains(@accessibility-id, 'LogoutButton')]").click()
|
||||
self.driver.find_element(AppiumBy.XPATH, "//button[contains(@name, 'Shut Down') and contains(@accessibility-id, 'shutdownButton')]").click()
|
||||
self.assertStdOutLine("shutdown")
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,17 +5,13 @@
|
|||
*/
|
||||
|
||||
import QtQuick
|
||||
import QtQuick.Layouts
|
||||
import QtQuick.Controls as QQC2
|
||||
import QtQuick.Window
|
||||
|
||||
import org.kde.plasma.components as PlasmaComponents
|
||||
import org.kde.coreaddons as KCoreAddons
|
||||
import org.kde.kirigami as Kirigami
|
||||
|
||||
import org.kde.breeze.components
|
||||
import "timer.js" as AutoTriggerTimer
|
||||
|
||||
import org.kde.plasma.private.sessions
|
||||
import "controlsowner.js" as ControlsOwner
|
||||
|
||||
Item {
|
||||
id: root
|
||||
|
|
@ -43,6 +39,7 @@ Item {
|
|||
|
||||
property real timeout: 30
|
||||
property real remainingTime: root.timeout
|
||||
readonly property bool countingDown: countDownTimer.running
|
||||
|
||||
property var currentAction: {
|
||||
switch (sdtype) {
|
||||
|
|
@ -57,17 +54,34 @@ Item {
|
|||
|
||||
readonly property bool showAllOptions: sdtype === ShutdownType.ShutdownTypeDefault
|
||||
|
||||
KCoreAddons.KUser {
|
||||
id: kuser
|
||||
Component {
|
||||
id: controlsComponent
|
||||
LogoutControls {}
|
||||
}
|
||||
|
||||
// For showing an "other users are logged in" hint
|
||||
SessionsModel {
|
||||
id: otherSessionsModel
|
||||
function ensureControlsExist() {
|
||||
if (!ControlsOwner.controls) {
|
||||
ControlsOwner.controls = controlsComponent.createObject(root);
|
||||
}
|
||||
}
|
||||
|
||||
// In case the default values ever change
|
||||
includeUnusedSessions: false
|
||||
includeOwnSession: false
|
||||
Component.onCompleted: ensureControlsExist()
|
||||
|
||||
// Not MouseArea: hovering a LogoutButton steals
|
||||
// the pointer from it, so containsMouse would flicker and the row would
|
||||
// flash in and out. HoverHandler is non-blocking, so it just tracks the
|
||||
// pointer position and stays accurate.
|
||||
HoverHandler {
|
||||
onHoveredChanged: {
|
||||
if (hovered) {
|
||||
if (root.Window.window) {
|
||||
root.Window.window.requestActivate();
|
||||
}
|
||||
if (ControlsOwner.controls && ControlsOwner.controls.parent !== root) {
|
||||
ControlsOwner.controls.parent = root;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QQC2.Action {
|
||||
|
|
@ -107,244 +121,4 @@ Item {
|
|||
anchors.fill: parent
|
||||
onClicked: root.cancelRequested()
|
||||
}
|
||||
UserDelegate {
|
||||
width: Kirigami.Units.gridUnit * 8
|
||||
height: Kirigami.Units.gridUnit * 9
|
||||
anchors {
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
bottom: parent.verticalCenter
|
||||
}
|
||||
constrainText: false
|
||||
avatarPath: kuser.faceIconUrl
|
||||
iconSource: "user-identity"
|
||||
isCurrent: true
|
||||
name: kuser.fullName
|
||||
}
|
||||
ColumnLayout {
|
||||
id: column
|
||||
|
||||
anchors {
|
||||
top: parent.verticalCenter
|
||||
topMargin: Kirigami.Units.gridUnit * 2
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
spacing: Kirigami.Units.largeSpacing
|
||||
|
||||
height: Math.max(implicitHeight, Kirigami.Units.gridUnit * 10)
|
||||
width: Math.max(implicitWidth, Kirigami.Units.gridUnit * 16)
|
||||
|
||||
PlasmaComponents.Label {
|
||||
font.pointSize: Kirigami.Theme.defaultFont.pointSize + 1
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
//opacity, as visible would re-layout
|
||||
opacity: countDownTimer.running ? 1 : 0
|
||||
Behavior on opacity {
|
||||
OpacityAnimator {
|
||||
duration: Kirigami.Units.longDuration
|
||||
easing.type: Easing.InOutQuad
|
||||
}
|
||||
}
|
||||
text: {
|
||||
switch (sdtype) {
|
||||
case ShutdownType.ShutdownTypeReboot:
|
||||
return softwareUpdatePending ? i18ndp("plasma_shell_org.kde.plasma.desktop", "Installing software updates and restarting in 1 second", "Installing software updates and restarting in %1 seconds", root.remainingTime)
|
||||
: i18ndp("plasma_shell_org.kde.plasma.desktop", "Restarting in 1 second", "Restarting in %1 seconds", root.remainingTime);
|
||||
case ShutdownType.ShutdownTypeNone:
|
||||
return i18ndp("plasma_shell_org.kde.plasma.desktop", "Logging out in 1 second", "Logging out in %1 seconds", root.remainingTime);
|
||||
case ShutdownType.ShutdownTypeHalt:
|
||||
default:
|
||||
return softwareUpdatePending ? i18ndp("plasma_shell_org.kde.plasma.desktop", "Installing software updates and shutting down in 1 second", "Installing software updates and shutting down in %1 seconds", root.remainingTime)
|
||||
: i18ndp("plasma_shell_org.kde.plasma.desktop", "Shutting down in 1 second", "Shutting down in %1 seconds", root.remainingTime);
|
||||
}
|
||||
}
|
||||
textFormat: Text.PlainText
|
||||
}
|
||||
|
||||
PlasmaComponents.Label {
|
||||
font.pointSize: Kirigami.Theme.defaultFont.pointSize + 1
|
||||
Layout.maximumWidth: Math.max(Kirigami.Units.gridUnit * 16, logoutButtonsRow.implicitWidth)
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.fillWidth: true
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
wrapMode: Text.WordWrap
|
||||
font.italic: true
|
||||
text: i18ndp("plasma_shell_org.kde.plasma.desktop",
|
||||
"One other user is currently logged in. If the computer is shut down or restarted, that user may lose work.",
|
||||
"%1 other users are currently logged in. If the computer is shut down or restarted, those users may lose work.",
|
||||
otherSessionsModel.count)
|
||||
textFormat: Text.PlainText
|
||||
visible: otherSessionsModel.count > 0 && (sdtype !== ShutdownType.ShutdownTypeNone || root.showAllOptions)
|
||||
}
|
||||
|
||||
PlasmaComponents.Label {
|
||||
font.pointSize: Kirigami.Theme.defaultFont.pointSize + 1
|
||||
Layout.maximumWidth: Math.max(Kirigami.Units.gridUnit * 16, logoutButtonsRow.implicitWidth)
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.fillWidth: true
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
wrapMode: Text.WordWrap
|
||||
font.italic: true
|
||||
text: {
|
||||
if (isUefi) {
|
||||
return i18nd("plasma_shell_org.kde.plasma.desktop", "When restarted, the computer will enter UEFI firmware settings.");
|
||||
} else {
|
||||
return i18nd("plasma_shell_org.kde.plasma.desktop", "When restarted, the computer will enter the firmware setup screen.");
|
||||
}
|
||||
}
|
||||
textFormat: Text.PlainText
|
||||
visible: rebootToFirmwareSetup
|
||||
}
|
||||
|
||||
PlasmaComponents.Label {
|
||||
font.pointSize: Kirigami.Theme.defaultFont.pointSize + 1
|
||||
Layout.maximumWidth: Math.max(Kirigami.Units.gridUnit * 16, logoutButtonsRow.implicitWidth)
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.fillWidth: true
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
wrapMode: Text.WordWrap
|
||||
font.italic: true
|
||||
text: i18nd("plasma_shell_org.kde.plasma.desktop", "When restarted, the computer will enter the boot loader menu.")
|
||||
textFormat: Text.PlainText
|
||||
visible: rebootToBootLoaderMenu
|
||||
}
|
||||
|
||||
PlasmaComponents.Label {
|
||||
font.pointSize: Kirigami.Theme.defaultFont.pointSize + 1
|
||||
Layout.maximumWidth: Math.max(Kirigami.Units.gridUnit * 16, logoutButtonsRow.implicitWidth)
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.fillWidth: true
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
wrapMode: Text.WordWrap
|
||||
font.italic: true
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "%1 is a boot loader entry", "When restarted, the computer will switch to %1.", rebootToBootLoaderEntry)
|
||||
textFormat: Text.PlainText
|
||||
visible: rebootToBootLoaderEntry != ""
|
||||
}
|
||||
|
||||
GridLayout {
|
||||
id: logoutButtonsRow
|
||||
|
||||
readonly property int spacing: Kirigami.Units.largeSpacing
|
||||
rowSpacing: spacing
|
||||
columnSpacing: spacing
|
||||
|
||||
Layout.topMargin: Kirigami.Units.gridUnit * 2 - column.spacing
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
|
||||
readonly property int buttonCount: visibleChildren.length
|
||||
readonly property int singleRowWidth: (children[0].implicitWidth * buttonCount) + (spacing * (buttonCount - 1))
|
||||
columns: singleRowWidth < root.width ? buttonCount : Math.ceil(buttonCount / 2)
|
||||
|
||||
LogoutButton {
|
||||
id: suspendButton
|
||||
icon.name: "system-suspend"
|
||||
text: root.showAllOptions ? i18ndc("plasma_shell_org.kde.plasma.desktop", "Suspend to RAM", "Slee&p")
|
||||
: i18ndc("plasma_shell_org.kde.plasma.desktop", "Suspend to RAM", "Slee&p Now")
|
||||
onClicked: root.sleepRequested()
|
||||
KeyNavigation.left: cancelButton
|
||||
KeyNavigation.right: hibernateButton.visible ? hibernateButton : (rebootButton.visible ? rebootButton : (shutdownButton.visible ? shutdownButton : (logoutButton.visible ? logoutButton : cancelButton)))
|
||||
visible: spdMethods.SuspendState && root.showAllOptions
|
||||
}
|
||||
LogoutButton {
|
||||
id: hibernateButton
|
||||
icon.name: "system-suspend-hibernate"
|
||||
text: root.showAllOptions ? i18nd("plasma_shell_org.kde.plasma.desktop", "&Hibernate")
|
||||
: i18nd("plasma_shell_org.kde.plasma.desktop", "&Hibernate Now")
|
||||
onClicked: root.hibernateRequested()
|
||||
KeyNavigation.left: suspendButton.visible ? suspendButton : cancelButton
|
||||
KeyNavigation.right: rebootButton.visible ? rebootButton : (shutdownButton.visible ? shutdownButton : (logoutButton.visible ? logoutButton : cancelButton))
|
||||
visible: spdMethods.HibernateState && root.showAllOptions
|
||||
}
|
||||
LogoutButton {
|
||||
id: rebootButton
|
||||
icon.name: softwareUpdatePending ? "system-reboot-update" : "system-reboot"
|
||||
text: {
|
||||
if (softwareUpdatePending) {
|
||||
return i18ndc("plasma_shell_org.kde.plasma.desktop", "@action:button Keep short", "Install Updates and Restart")
|
||||
} else {
|
||||
return root.showAllOptions ? i18nd("plasma_shell_org.kde.plasma.desktop", "&Restart")
|
||||
: i18nd("plasma_shell_org.kde.plasma.desktop", "&Restart Now")
|
||||
}
|
||||
}
|
||||
onClicked: {
|
||||
if (softwareUpdatePending) {
|
||||
root.rebootUpdateRequested();
|
||||
} else {
|
||||
root.rebootRequested();
|
||||
}
|
||||
}
|
||||
KeyNavigation.left: hibernateButton.visible ? hibernateButton : (suspendButton.visible ? suspendButton : cancelButton)
|
||||
KeyNavigation.right: rebootWithoutUpdatesButton.visible ? rebootWithoutUpdatesButton : (shutdownButton.visible ? shutdownButton : (logoutButton.visible ? logoutButton : cancelButton))
|
||||
focus: sdtype === ShutdownType.ShutdownTypeReboot
|
||||
visible: maysd && (sdtype === ShutdownType.ShutdownTypeReboot || root.showAllOptions)
|
||||
}
|
||||
LogoutButton {
|
||||
id: rebootWithoutUpdatesButton
|
||||
icon.name: "system-reboot"
|
||||
text: root.showAllOptions ? i18nd("plasma_shell_org.kde.plasma.desktop", "&Restart")
|
||||
: i18nd("plasma_shell_org.kde.plasma.desktop", "&Restart Now")
|
||||
onClicked: {
|
||||
root.rebootRequested();
|
||||
}
|
||||
KeyNavigation.left: rebootButton
|
||||
KeyNavigation.right: shutdownButton.visible ? shutdownButton : (logoutButton.visible ? logoutButton : cancelButton)
|
||||
visible: maysd && softwareUpdatePending && (sdtype === ShutdownType.ShutdownTypeReboot || root.showAllOptions)
|
||||
}
|
||||
LogoutButton {
|
||||
id: shutdownButton
|
||||
icon.name: softwareUpdatePending ? "system-shutdown-update" : "system-shutdown"
|
||||
text: {
|
||||
if (softwareUpdatePending) {
|
||||
return i18ndc("plasma_shell_org.kde.plasma.desktop", "@action:button Keep short", "Install Updates and Shut Down")
|
||||
} else {
|
||||
return root.showAllOptions ? i18nd("plasma_shell_org.kde.plasma.desktop", "&Shut Down")
|
||||
: i18nd("plasma_shell_org.kde.plasma.desktop", "&Shut Down Now")
|
||||
}
|
||||
}
|
||||
onClicked: {
|
||||
if (softwareUpdatePending) {
|
||||
root.haltUpdateRequested();
|
||||
} else {
|
||||
root.haltRequested();
|
||||
}
|
||||
}
|
||||
KeyNavigation.left: rebootWithoutUpdatesButton.visible ? rebootWithoutUpdatesButton : (rebootButton.visible ? rebootButton : (hibernateButton.visible ? hibernateButton : (suspendButton.visible ? suspendButton : cancelButton)))
|
||||
KeyNavigation.right: shutdownWithoutUpdatesButton.visible ? shutdownWithoutUpdatesButton : (logoutButton.visible ? logoutButton : cancelButton)
|
||||
focus: sdtype === ShutdownType.ShutdownTypeHalt || root.showAllOptions
|
||||
visible: maysd && (sdtype === ShutdownType.ShutdownTypeHalt || root.showAllOptions)
|
||||
}
|
||||
LogoutButton {
|
||||
id: shutdownWithoutUpdatesButton
|
||||
icon.name: "system-shutdown"
|
||||
text: root.showAllOptions ? i18nd("plasma_shell_org.kde.plasma.desktop", "&Shut Down")
|
||||
: i18nd("plasma_shell_org.kde.plasma.desktop", "&Shut Down Now")
|
||||
onClicked: {
|
||||
root.haltRequested();
|
||||
}
|
||||
KeyNavigation.left: shutdownButton
|
||||
KeyNavigation.right: logoutButton.visible ? logoutButton : cancelButton
|
||||
focus: sdtype === ShutdownType.ShutdownTypeHalt || root.showAllOptions
|
||||
visible: maysd && softwareUpdatePending && (sdtype === ShutdownType.ShutdownTypeHalt || root.showAllOptions)
|
||||
}
|
||||
LogoutButton {
|
||||
id: logoutButton
|
||||
icon.name: "system-log-out"
|
||||
text: root.showAllOptions ? i18nd("plasma_shell_org.kde.plasma.desktop", "&Log Out")
|
||||
: i18nd("plasma_shell_org.kde.plasma.desktop", "&Log Out Now")
|
||||
onClicked: root.logoutRequested()
|
||||
KeyNavigation.left: shutdownWithoutUpdatesButton.visible ? shutdownWithoutUpdatesButton : (shutdownButton.visible ? shutdownButton : (rebootWithoutUpdatesButton.visible ? rebootWithoutUpdatesButton : (rebootButton.visible ? rebootButton : (hibernateButton.visible ? hibernateButton : (suspendButton.visible ? suspendButton : cancelButton)))))
|
||||
KeyNavigation.right: cancelButton
|
||||
focus: sdtype === ShutdownType.ShutdownTypeNone
|
||||
visible: canLogout && (sdtype === ShutdownType.ShutdownTypeNone || root.showAllOptions)
|
||||
}
|
||||
LogoutButton {
|
||||
id: cancelButton
|
||||
icon.name: "dialog-cancel"
|
||||
text: i18nd("plasma_shell_org.kde.plasma.desktop", "&Cancel")
|
||||
onClicked: root.cancelRequested()
|
||||
KeyNavigation.left: logoutButton.visible ? logoutButton : (shutdownWithoutUpdatesButton.visible ? shutdownWithoutUpdatesButton : (shutdownButton.visible ? shutdownButton : (rebootWithoutUpdatesButton.visible ? rebootWithoutUpdatesButton : (rebootButton.visible ? rebootButton : (hibernateButton.visible ? hibernateButton : suspendButton)))))
|
||||
KeyNavigation.right: suspendButton.visible ? suspendButton : (hibernateButton.visible ? hibernateButton : rebootButton)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,8 @@ ActionButton {
|
|||
font.underline: false // See https://phabricator.kde.org/D9452
|
||||
opacity: activeFocus || hovered ? 1 : 0.75
|
||||
|
||||
Keys.onPressed: {
|
||||
Keys.onPressed: (event) => {
|
||||
AutoTriggerTimer.cancelAutoTrigger();
|
||||
event.accepted = false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
305
desktoppackage/contents/logout/LogoutControls.qml
Normal file
305
desktoppackage/contents/logout/LogoutControls.qml
Normal file
|
|
@ -0,0 +1,305 @@
|
|||
/*
|
||||
SPDX-FileCopyrightText: 2014 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
import QtQuick
|
||||
import QtQuick.Layouts
|
||||
|
||||
import org.kde.plasma.components as PlasmaComponents
|
||||
import org.kde.coreaddons as KCoreAddons
|
||||
import org.kde.kirigami as Kirigami
|
||||
|
||||
import org.kde.breeze.components
|
||||
|
||||
import org.kde.plasma.private.sessions
|
||||
|
||||
Item {
|
||||
id: controls
|
||||
Kirigami.Theme.inherit: false
|
||||
Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
|
||||
anchors.fill: parent
|
||||
|
||||
readonly property Item hostRoot: parent
|
||||
readonly property bool showAllOptions: sdtype === ShutdownType.ShutdownTypeDefault
|
||||
|
||||
opacity: 0
|
||||
onHostRootChanged: fadeIn.restart()
|
||||
|
||||
NumberAnimation {
|
||||
id: fadeIn
|
||||
target: controls
|
||||
property: "opacity"
|
||||
from: 0
|
||||
to: 1
|
||||
duration: Kirigami.Units.longDuration
|
||||
easing.type: Easing.InOutQuad
|
||||
}
|
||||
|
||||
KCoreAddons.KUser {
|
||||
id: kuser
|
||||
}
|
||||
|
||||
// For showing an "other users are logged in" hint
|
||||
SessionsModel {
|
||||
id: otherSessionsModel
|
||||
|
||||
// In case the default values ever change
|
||||
includeUnusedSessions: false
|
||||
includeOwnSession: false
|
||||
}
|
||||
|
||||
Item {
|
||||
width: Kirigami.Units.gridUnit * 8
|
||||
height: Kirigami.Units.gridUnit * 9
|
||||
anchors {
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
bottom: parent.verticalCenter
|
||||
}
|
||||
|
||||
UserDelegate {
|
||||
anchors.fill: parent
|
||||
constrainText: false
|
||||
avatarPath: kuser.faceIconUrl
|
||||
iconSource: "user-identity"
|
||||
isCurrent: true
|
||||
name: kuser.fullName
|
||||
}
|
||||
}
|
||||
ColumnLayout {
|
||||
id: column
|
||||
|
||||
anchors {
|
||||
top: parent.verticalCenter
|
||||
topMargin: Kirigami.Units.gridUnit * 2
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
spacing: Kirigami.Units.largeSpacing
|
||||
|
||||
height: Math.max(implicitHeight, Kirigami.Units.gridUnit * 10)
|
||||
width: Math.max(implicitWidth, Kirigami.Units.gridUnit * 16)
|
||||
|
||||
PlasmaComponents.Label {
|
||||
font.pointSize: Kirigami.Theme.defaultFont.pointSize + 1
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
//opacity, as visible would re-layout
|
||||
opacity: controls.hostRoot.countingDown ? 1 : 0
|
||||
Behavior on opacity {
|
||||
PropertyAnimation {
|
||||
duration: Kirigami.Units.longDuration
|
||||
easing.type: Easing.InOutQuad
|
||||
}
|
||||
}
|
||||
text: {
|
||||
switch (sdtype) {
|
||||
case ShutdownType.ShutdownTypeReboot:
|
||||
return softwareUpdatePending ? i18ndp("plasma_shell_org.kde.plasma.desktop", "Installing software updates and restarting in 1 second", "Installing software updates and restarting in %1 seconds", controls.hostRoot.remainingTime)
|
||||
: i18ndp("plasma_shell_org.kde.plasma.desktop", "Restarting in 1 second", "Restarting in %1 seconds", controls.hostRoot.remainingTime);
|
||||
case ShutdownType.ShutdownTypeNone:
|
||||
return i18ndp("plasma_shell_org.kde.plasma.desktop", "Logging out in 1 second", "Logging out in %1 seconds", controls.hostRoot.remainingTime);
|
||||
case ShutdownType.ShutdownTypeHalt:
|
||||
default:
|
||||
return softwareUpdatePending ? i18ndp("plasma_shell_org.kde.plasma.desktop", "Installing software updates and shutting down in 1 second", "Installing software updates and shutting down in %1 seconds", controls.hostRoot.remainingTime)
|
||||
: i18ndp("plasma_shell_org.kde.plasma.desktop", "Shutting down in 1 second", "Shutting down in %1 seconds", controls.hostRoot.remainingTime);
|
||||
}
|
||||
}
|
||||
textFormat: Text.PlainText
|
||||
}
|
||||
|
||||
PlasmaComponents.Label {
|
||||
font.pointSize: Kirigami.Theme.defaultFont.pointSize + 1
|
||||
Layout.maximumWidth: Math.max(Kirigami.Units.gridUnit * 16, logoutButtonsRow.implicitWidth)
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.fillWidth: true
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
wrapMode: Text.WordWrap
|
||||
font.italic: true
|
||||
text: i18ndp("plasma_shell_org.kde.plasma.desktop",
|
||||
"One other user is currently logged in. If the computer is shut down or restarted, that user may lose work.",
|
||||
"%1 other users are currently logged in. If the computer is shut down or restarted, those users may lose work.",
|
||||
otherSessionsModel.count)
|
||||
textFormat: Text.PlainText
|
||||
visible: otherSessionsModel.count > 0 && (sdtype !== ShutdownType.ShutdownTypeNone || controls.showAllOptions)
|
||||
}
|
||||
|
||||
PlasmaComponents.Label {
|
||||
font.pointSize: Kirigami.Theme.defaultFont.pointSize + 1
|
||||
Layout.maximumWidth: Math.max(Kirigami.Units.gridUnit * 16, logoutButtonsRow.implicitWidth)
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.fillWidth: true
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
wrapMode: Text.WordWrap
|
||||
font.italic: true
|
||||
text: {
|
||||
if (isUefi) {
|
||||
return i18nd("plasma_shell_org.kde.plasma.desktop", "When restarted, the computer will enter UEFI firmware settings.");
|
||||
} else {
|
||||
return i18nd("plasma_shell_org.kde.plasma.desktop", "When restarted, the computer will enter the firmware setup screen.");
|
||||
}
|
||||
}
|
||||
textFormat: Text.PlainText
|
||||
visible: rebootToFirmwareSetup
|
||||
}
|
||||
|
||||
PlasmaComponents.Label {
|
||||
font.pointSize: Kirigami.Theme.defaultFont.pointSize + 1
|
||||
Layout.maximumWidth: Math.max(Kirigami.Units.gridUnit * 16, logoutButtonsRow.implicitWidth)
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.fillWidth: true
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
wrapMode: Text.WordWrap
|
||||
font.italic: true
|
||||
text: i18nd("plasma_shell_org.kde.plasma.desktop", "When restarted, the computer will enter the boot loader menu.")
|
||||
textFormat: Text.PlainText
|
||||
visible: rebootToBootLoaderMenu
|
||||
}
|
||||
|
||||
PlasmaComponents.Label {
|
||||
font.pointSize: Kirigami.Theme.defaultFont.pointSize + 1
|
||||
Layout.maximumWidth: Math.max(Kirigami.Units.gridUnit * 16, logoutButtonsRow.implicitWidth)
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.fillWidth: true
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
wrapMode: Text.WordWrap
|
||||
font.italic: true
|
||||
text: i18ndc("plasma_shell_org.kde.plasma.desktop", "%1 is a boot loader entry", "When restarted, the computer will switch to %1.", rebootToBootLoaderEntry)
|
||||
textFormat: Text.PlainText
|
||||
visible: rebootToBootLoaderEntry != ""
|
||||
}
|
||||
|
||||
GridLayout {
|
||||
id: logoutButtonsRow
|
||||
|
||||
readonly property int spacing: Kirigami.Units.largeSpacing
|
||||
rowSpacing: spacing
|
||||
columnSpacing: spacing
|
||||
|
||||
Layout.topMargin: Kirigami.Units.gridUnit * 2 - column.spacing
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
|
||||
readonly property int buttonCount: visibleChildren.length
|
||||
readonly property int singleRowWidth: (children[0].implicitWidth * buttonCount) + (spacing * (buttonCount - 1))
|
||||
columns: singleRowWidth < controls.width ? buttonCount : Math.ceil(buttonCount / 2)
|
||||
|
||||
LogoutButton {
|
||||
id: suspendButton
|
||||
objectName: "suspendButton"
|
||||
icon.name: "system-suspend"
|
||||
text: controls.showAllOptions ? i18ndc("plasma_shell_org.kde.plasma.desktop", "Suspend to RAM", "Slee&p")
|
||||
: i18ndc("plasma_shell_org.kde.plasma.desktop", "Suspend to RAM", "Slee&p Now")
|
||||
onClicked: controls.hostRoot.sleepRequested()
|
||||
KeyNavigation.left: cancelButton
|
||||
KeyNavigation.right: hibernateButton.visible ? hibernateButton : (rebootButton.visible ? rebootButton : (shutdownButton.visible ? shutdownButton : (logoutButton.visible ? logoutButton : cancelButton)))
|
||||
visible: spdMethods.SuspendState && controls.showAllOptions
|
||||
}
|
||||
LogoutButton {
|
||||
id: hibernateButton
|
||||
objectName: "hibernateButton"
|
||||
icon.name: "system-suspend-hibernate"
|
||||
text: controls.showAllOptions ? i18nd("plasma_shell_org.kde.plasma.desktop", "&Hibernate")
|
||||
: i18nd("plasma_shell_org.kde.plasma.desktop", "&Hibernate Now")
|
||||
onClicked: controls.hostRoot.hibernateRequested()
|
||||
KeyNavigation.left: suspendButton.visible ? suspendButton : cancelButton
|
||||
KeyNavigation.right: rebootButton.visible ? rebootButton : (shutdownButton.visible ? shutdownButton : (logoutButton.visible ? logoutButton : cancelButton))
|
||||
visible: spdMethods.HibernateState && controls.showAllOptions
|
||||
}
|
||||
LogoutButton {
|
||||
id: rebootButton
|
||||
objectName: "rebootButton"
|
||||
icon.name: softwareUpdatePending ? "system-reboot-update" : "system-reboot"
|
||||
text: {
|
||||
if (softwareUpdatePending) {
|
||||
return i18ndc("plasma_shell_org.kde.plasma.desktop", "@action:button Keep short", "Install Updates and Restart")
|
||||
} else {
|
||||
return controls.showAllOptions ? i18nd("plasma_shell_org.kde.plasma.desktop", "&Restart")
|
||||
: i18nd("plasma_shell_org.kde.plasma.desktop", "&Restart Now")
|
||||
}
|
||||
}
|
||||
onClicked: {
|
||||
if (softwareUpdatePending) {
|
||||
controls.hostRoot.rebootUpdateRequested();
|
||||
} else {
|
||||
controls.hostRoot.rebootRequested();
|
||||
}
|
||||
}
|
||||
KeyNavigation.left: hibernateButton.visible ? hibernateButton : (suspendButton.visible ? suspendButton : cancelButton)
|
||||
KeyNavigation.right: rebootWithoutUpdatesButton.visible ? rebootWithoutUpdatesButton : (shutdownButton.visible ? shutdownButton : (logoutButton.visible ? logoutButton : cancelButton))
|
||||
focus: sdtype === ShutdownType.ShutdownTypeReboot
|
||||
visible: maysd && (sdtype === ShutdownType.ShutdownTypeReboot || controls.showAllOptions)
|
||||
}
|
||||
LogoutButton {
|
||||
id: rebootWithoutUpdatesButton
|
||||
objectName: "rebootWithoutUpdatesButton"
|
||||
icon.name: "system-reboot"
|
||||
text: controls.showAllOptions ? i18nd("plasma_shell_org.kde.plasma.desktop", "&Restart")
|
||||
: i18nd("plasma_shell_org.kde.plasma.desktop", "&Restart Now")
|
||||
onClicked: {
|
||||
controls.hostRoot.rebootRequested();
|
||||
}
|
||||
KeyNavigation.left: rebootButton
|
||||
KeyNavigation.right: shutdownButton.visible ? shutdownButton : (logoutButton.visible ? logoutButton : cancelButton)
|
||||
visible: maysd && softwareUpdatePending && (sdtype === ShutdownType.ShutdownTypeReboot || controls.showAllOptions)
|
||||
}
|
||||
LogoutButton {
|
||||
id: shutdownButton
|
||||
objectName: "shutdownButton"
|
||||
icon.name: softwareUpdatePending ? "system-shutdown-update" : "system-shutdown"
|
||||
text: {
|
||||
if (softwareUpdatePending) {
|
||||
return i18ndc("plasma_shell_org.kde.plasma.desktop", "@action:button Keep short", "Install Updates and Shut Down")
|
||||
} else {
|
||||
return controls.showAllOptions ? i18nd("plasma_shell_org.kde.plasma.desktop", "&Shut Down")
|
||||
: i18nd("plasma_shell_org.kde.plasma.desktop", "&Shut Down Now")
|
||||
}
|
||||
}
|
||||
onClicked: {
|
||||
if (softwareUpdatePending) {
|
||||
controls.hostRoot.haltUpdateRequested();
|
||||
} else {
|
||||
controls.hostRoot.haltRequested();
|
||||
}
|
||||
}
|
||||
KeyNavigation.left: rebootWithoutUpdatesButton.visible ? rebootWithoutUpdatesButton : (rebootButton.visible ? rebootButton : (hibernateButton.visible ? hibernateButton : (suspendButton.visible ? suspendButton : cancelButton)))
|
||||
KeyNavigation.right: shutdownWithoutUpdatesButton.visible ? shutdownWithoutUpdatesButton : (logoutButton.visible ? logoutButton : cancelButton)
|
||||
focus: sdtype === ShutdownType.ShutdownTypeHalt || controls.showAllOptions
|
||||
visible: maysd && (sdtype === ShutdownType.ShutdownTypeHalt || controls.showAllOptions)
|
||||
}
|
||||
LogoutButton {
|
||||
id: shutdownWithoutUpdatesButton
|
||||
objectName: "shutdownWithoutUpdatesButton"
|
||||
icon.name: "system-shutdown"
|
||||
text: controls.showAllOptions ? i18nd("plasma_shell_org.kde.plasma.desktop", "&Shut Down")
|
||||
: i18nd("plasma_shell_org.kde.plasma.desktop", "&Shut Down Now")
|
||||
onClicked: {
|
||||
controls.hostRoot.haltRequested();
|
||||
}
|
||||
KeyNavigation.left: shutdownButton
|
||||
KeyNavigation.right: logoutButton.visible ? logoutButton : cancelButton
|
||||
focus: sdtype === ShutdownType.ShutdownTypeHalt || controls.showAllOptions
|
||||
visible: maysd && softwareUpdatePending && (sdtype === ShutdownType.ShutdownTypeHalt || controls.showAllOptions)
|
||||
}
|
||||
LogoutButton {
|
||||
id: logoutButton
|
||||
objectName: "logoutButton"
|
||||
icon.name: "system-log-out"
|
||||
text: controls.showAllOptions ? i18nd("plasma_shell_org.kde.plasma.desktop", "&Log Out")
|
||||
: i18nd("plasma_shell_org.kde.plasma.desktop", "&Log Out Now")
|
||||
onClicked: controls.hostRoot.logoutRequested()
|
||||
KeyNavigation.left: shutdownWithoutUpdatesButton.visible ? shutdownWithoutUpdatesButton : (shutdownButton.visible ? shutdownButton : (rebootWithoutUpdatesButton.visible ? rebootWithoutUpdatesButton : (rebootButton.visible ? rebootButton : (hibernateButton.visible ? hibernateButton : (suspendButton.visible ? suspendButton : cancelButton)))))
|
||||
KeyNavigation.right: cancelButton
|
||||
focus: sdtype === ShutdownType.ShutdownTypeNone
|
||||
visible: canLogout && (sdtype === ShutdownType.ShutdownTypeNone || controls.showAllOptions)
|
||||
}
|
||||
LogoutButton {
|
||||
id: cancelButton
|
||||
objectName: "cancelButton"
|
||||
icon.name: "dialog-cancel"
|
||||
text: i18nd("plasma_shell_org.kde.plasma.desktop", "&Cancel")
|
||||
onClicked: controls.hostRoot.cancelRequested()
|
||||
KeyNavigation.left: logoutButton.visible ? logoutButton : (shutdownWithoutUpdatesButton.visible ? shutdownWithoutUpdatesButton : (shutdownButton.visible ? shutdownButton : (rebootWithoutUpdatesButton.visible ? rebootWithoutUpdatesButton : (rebootButton.visible ? rebootButton : (hibernateButton.visible ? hibernateButton : suspendButton)))))
|
||||
KeyNavigation.right: suspendButton.visible ? suspendButton : (hibernateButton.visible ? hibernateButton : rebootButton)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
9
desktoppackage/contents/logout/controlsowner.js
Normal file
9
desktoppackage/contents/logout/controlsowner.js
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
/*
|
||||
SPDX-FileCopyrightText: 2026 Ramil Nurmanov <ramil2004nur@gmail.com>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
.pragma library
|
||||
|
||||
var controls = null;
|
||||
Loading…
Reference in a new issue