pool/plasma5-workspace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 509064 from home:wolfi323:test

Browse Source 
- Add logoutdialog-honor-Offer-shutdown-options.patch to make the logout dialog respect the "Offer shutdown options" setting and hide "Reboot" and "Shutdown" if disabled (boo#1008844)

OBS-URL: https://build.opensuse.org/request/show/509064
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=333
This commit is contained in:
Luca Beltrame 2017-07-10 05:13:12 +00:00 committed by Git OBS Bridge
parent 5440d17bed
commit 5ceec6ad52
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
logoutdialog-honor-Offer-shutdown-options.patch Normal file
View File

@ -0,0 +1,37 @@
From 913142c565ec7cb51f9d5406193d3c9a2562dbb0 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Sat, 8 Jul 2017 16:29:01 +0200
Subject: [Logout Dialog] Honor "Offer shutdown options"
"maysd" stands for "may shut down" apparently.
Kickoff already removed the options in this case but clicking "Logout" yields the new dialog
which offers them all again.
Differential Revision: https://phabricator.kde.org/D6574
---
lookandfeel/contents/logout/Logout.qml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/contents/logout/Logout.qml
index 460b802..251e1ee 100644
--- a/lookandfeel/contents/logout/Logout.qml
+++ b/lookandfeel/contents/logout/Logout.qml
@@ -168,6 +168,7 @@ PlasmaCore.ColorScope {
KeyNavigation.left: suspendButton
KeyNavigation.right: shutdownButton
focus: sdtype == ShutdownType.ShutdownTypeReboot
+ visible: maysd
}
LogoutButton {
id: shutdownButton
@@ -177,6 +178,7 @@ PlasmaCore.ColorScope {
KeyNavigation.left: rebootButton
KeyNavigation.right: logoutButton
focus: sdtype == ShutdownType.ShutdownTypeHalt
+ visible: maysd
}
LogoutButton {
id: logoutButton
--
cgit v0.11.2

7
plasma5-workspace.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Jul 9 09:51:05 UTC 2017 - wbauer@tmo.at
- Add logoutdialog-honor-Offer-shutdown-options.patch to make the
logout dialog respect the "Offer shutdown options" setting and
hide "Reboot" and "Shutdown" if disabled (boo#1008844)
-------------------------------------------------------------------
Sat Jul 1 10:48:32 UTC 2017 - wbauer@tmo.at

2
plasma5-workspace.spec
View File

@ -39,6 +39,7 @@ Patch1: 0001-Ignore-default-sddm-face-icons.patch
# PATCHES 100-200 and above are from upstream 5.10 branch
# PATCHES 201-300 and above are from upstream master/5.11 branch
Patch201: applauncher-allow-to-show-apps-by-name.patch
Patch202: logoutdialog-honor-Offer-shutdown-options.patch
BuildRequires: breeze5-icons
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@ -211,6 +212,7 @@ workspace. Development files.
%patch0 -p1
%patch1 -p1
%patch201 -p1
%patch202 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}