Hello community,
here is the log from the commit of package plasma5-workspace for
openSUSE:Factory checked in at 2017-04-17 10:24:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old)
and /work/SRC/openSUSE:Factory/.plasma5-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-workspace"
Mon Apr 17 10:24:31 2017 rev:62 rq:487882 version:5.9.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes
2017-03-28 15:17:19.371200980 +0200
+++ /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma5-workspace.changes
2017-04-17 10:24:33.061171258 +0200
@@ -1,0 +2,11 @@
+Thu Apr 13 18:13:46 UTC 2017 - fab...@ritter-vogt.de
+
+- Add patch to fix some logout UI issues:
+ * 0001-Some-UI-fixes-for-logout-dialog.patch
+
+-------------------------------------------------------------------
+Sat Apr 8 11:43:07 UTC 2017 - fab...@ritter-vogt.de
+
+- Remove empty files in %_kf5_appstreamdir
+
+-------------------------------------------------------------------
New:
----
0001-Some-UI-fixes-for-logout-dialog.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma5-workspace.spec ++++++
--- /var/tmp/diff_new_pack.zbnlRz/_old 2017-04-17 10:24:33.925048915 +0200
+++ /var/tmp/diff_new_pack.zbnlRz/_new 2017-04-17 10:24:33.925048915 +0200
@@ -40,6 +40,8 @@
Patch2: 0001-Ignore-default-sddm-face-icons.patch
# PATCHES 100-200 and above are from upstream 5.9 branch
# PATCHES 201-300 and above are from upstream master/5.10 branch
+# PATCH-FIX-UPSTREAM
+Patch201: 0001-Some-UI-fixes-for-logout-dialog.patch
BuildRequires: breeze5-icons
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@@ -212,6 +214,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch201 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm
-DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
@@ -227,6 +230,9 @@
%suse_update_desktop_file -r
%{buildroot}%{_kf5_applicationsdir}/org.kde.klipper.desktop System
TrayIcon
mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/48x48/apps/
cp %{_kf5_iconsdir}/breeze/apps/48/klipper.svg
%{buildroot}%{_kf5_iconsdir}/hicolor/48x48/apps/
+ # remove empty/invalid appstream xml files. kpackagetool5 generates invalid
files sometimes...
+ # remove this once kpackagetool5 is fixed
+ find %{buildroot}%{_kf5_appstreamdir} -type f -size 0 -print -delete
# we have a separate package for Plasma5 session
rm -rfv %{buildroot}%{_kf5_sharedir}/xsessions
rm -rfv %{buildroot}%{_kf5_sharedir}/wayland-sessions
++++++ 0001-Some-UI-fixes-for-logout-dialog.patch ++++++
>From 553535ea35c9e3a2b82fc46e76e0b72fbd2143a6 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fab...@ritter-vogt.de>
Date: Sun, 9 Apr 2017 13:34:21 +0200
Subject: [PATCH] Some UI fixes for logout dialog
Less intrusive parts of 5f2f343ef ('UI fixes for logout dialog'):
* add an OK button, that was complained a lot
* Stop timer with arrow keys
* Hide timer label if timer not running
---
lookandfeel/contents/logout/Logout.qml | 22 +++++++++++++++++++---
lookandfeel/contents/logout/LogoutButton.qml | 1 +
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/lookandfeel/contents/logout/Logout.qml
b/lookandfeel/contents/logout/Logout.qml
index 839c390f..e1573f5e 100644
--- a/lookandfeel/contents/logout/Logout.qml
+++ b/lookandfeel/contents/logout/Logout.qml
@@ -74,6 +74,7 @@ PlasmaCore.ColorScope {
}
Timer {
+ id: countDownTimer
running: true
repeat: true
interval: 1000
@@ -155,6 +156,14 @@ PlasmaCore.ColorScope {
PlasmaComponents.Label {
Layout.alignment: Qt.AlignHCenter
+ //opacity, as visible would re-layout
+ opacity: countDownTimer.running ? 1 : 0
+ Behavior on opacity {
+ OpacityAnimator {
+ duration: units.longDuration
+ easing.type: Easing.InOutQuad
+ }
+ }
text: {
switch (sdtype) {
case ShutdownType.ShutdownTypeReboot:
@@ -167,10 +176,17 @@ PlasmaCore.ColorScope {
}
}
- PlasmaComponents.Button {
+ RowLayout {
Layout.alignment: Qt.AlignHCenter
- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Cancel")
- onClicked: root.cancelRequested()
+ PlasmaComponents.Button {
+ enabled: root.currentAction != null
+ text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "OK")
+ onClicked: root.currentAction()
+ }
+ PlasmaComponents.Button {
+ text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Cancel")
+ onClicked: root.cancelRequested()
+ }
}
}
}
diff --git a/lookandfeel/contents/logout/LogoutButton.qml
b/lookandfeel/contents/logout/LogoutButton.qml
index 4c92657e..4de0b0d3 100644
--- a/lookandfeel/contents/logout/LogoutButton.qml
+++ b/lookandfeel/contents/logout/LogoutButton.qml
@@ -35,4 +35,5 @@ ActionButton {
easing.type: Easing.InOutQuad
}
}
+ Keys.onPressed: countDownTimer.running = false
}
--
2.12.0
