diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/contents/logout/Logout.qml --- a/lookandfeel/contents/logout/Logout.qml +++ b/lookandfeel/contents/logout/Logout.qml @@ -20,6 +20,7 @@ import QtQuick 2.2 import QtQuick.Layouts 1.2 import QtQuick.Controls 1.1 as Controls +import QtGraphicalEffects 1.0 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents @@ -136,7 +137,13 @@ iconSource: "user-identity" isCurrent: true name: kuser.fullName +/* ColorOverlay { + anchors.fill: parent + source: parent + color: "#b4b4b4" + }*/ } + ColumnLayout { anchors { top: parent.verticalCenter @@ -156,16 +163,26 @@ iconSource: "system-suspend" text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Suspend") action: root.sleepRequested - KeyNavigation.left: logoutButton - KeyNavigation.right: rebootButton + KeyNavigation.left: shutdownButton + KeyNavigation.right: logoutButton visible: spdMethods.SuspendState } + LogoutButton { + id: logoutButton + iconSource: "system-log-out" + text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Logout") + action: root.logoutRequested + KeyNavigation.left: suspendButton + KeyNavigation.right: rebootButton + focus: sdtype == ShutdownType.ShutdownTypeNone + visible: canLogout + } LogoutButton { id: rebootButton iconSource: "system-reboot" text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Reboot") action: root.rebootRequested - KeyNavigation.left: suspendButton + KeyNavigation.left: logoutButton KeyNavigation.right: shutdownButton focus: sdtype == ShutdownType.ShutdownTypeReboot } @@ -178,17 +195,13 @@ KeyNavigation.right: logoutButton focus: sdtype == ShutdownType.ShutdownTypeHalt } - LogoutButton { - id: logoutButton - iconSource: "system-log-out" - text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Logout") - action: root.logoutRequested - KeyNavigation.left: shutdownButton - KeyNavigation.right: suspendButton - focus: sdtype == ShutdownType.ShutdownTypeNone - visible: canLogout - } + + ColorOverlay { + anchors.fill: parent + source: parent + color: "white" } + } PlasmaComponents.Label { Layout.alignment: Qt.AlignHCenter @@ -200,6 +213,7 @@ easing.type: Easing.InOutQuad } } + color: "#c8c8c8" text: { switch (sdtype) { case ShutdownType.ShutdownTypeReboot: