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

Accepting request 290576 from KDE:Frameworks5

Browse Source 
- Add patches from upstream:
  0001-digital-clock-Invert-the-JS-timezone-offset-values.patch,
  0002-Set-aboutData-for-plasmashell.patch,
  0005-lookandfeel-Make-sure-the-OSD-is-not-bigger-than-1-3.patch,
  0006-Add-missing-import.patch,
  0007-Don-t-set-mode-here-otherwise-default-will-not-work.patch
  (kde#344701),
  0009-libtaskmanager-Use-the-icon-loaded-from-config-file-.patch,
  0010-Take-Shown-and-Hidden-status-in-account-when-showing.patch
  (kde#344795),
  0011-Fix-displaying-label1-in-job-notifications.patch and
  0012-Show-pause-stop-buttons-in-jobs-notification-only-fo.patch

OBS-URL: https://build.opensuse.org/request/show/290576
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2015-03-16 08:32:30 +00:00 committed by Git OBS Bridge
commit 3800898b91
11 changed files with 384 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0001-digital-clock-Invert-the-JS-timezone-offset-values.patch Normal file
View File

@ -0,0 +1,36 @@
From 93c512fece2d70b8881cba3b2b2eacfe5cd6ded6 Mon Sep 17 00:00:00 2001
From: Martin Klapetek <mklapetek@kde.org>
Date: Mon, 23 Feb 2015 18:15:21 +0100
Subject: [PATCH 01/12] [digital-clock] Invert the JS timezone offset values
JS timezone values are reversed compared to QTimeZone and we operate on
QTimeZone, so let's reverse the JS ones
---
applets/digital-clock/package/contents/ui/DigitalClock.qml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/applets/digital-clock/package/contents/ui/DigitalClock.qml b/applets/digital-clock/package/contents/ui/DigitalClock.qml
index e00b3a61c560fdd25a4e98cbf8c11eb6fa14069c..1292f730467d43a331d1253a3872d41ebe2d59c1 100644
--- a/applets/digital-clock/package/contents/ui/DigitalClock.qml
+++ b/applets/digital-clock/package/contents/ui/DigitalClock.qml
@@ -419,7 +419,7 @@ Item {
// get the time for the given timezone from the dataengine
var now = dataSource.data[plasmoid.configuration.selectedTimeZones[zone]]["DateTime"];
// get current UTC time
- var msUTC = now.getTime() + (now.getTimezoneOffset() * 60000);
+ var msUTC = now.getTime() + (-(now.getTimezoneOffset()) * 60000);
// add the dataengine TZ offset to it
var dateTime = new Date(msUTC + (dataSource.data[plasmoid.configuration.selectedTimeZones[zone]]["Offset"] * 1000));
@@ -488,7 +488,7 @@ Item {
}
}
- tzOffset = new Date().getTimezoneOffset();
+ tzOffset = -(new Date().getTimezoneOffset());
dateTimeChanged();
timeFormatCorrection(Qt.locale().timeFormat(Locale.ShortFormat));
updateToolTip();
--
2.3.1

70
0002-Set-aboutData-for-plasmashell.patch Normal file
View File

@ -0,0 +1,70 @@
From 6821b69fa1b06375123bffa0a7a492276a831a2b Mon Sep 17 00:00:00 2001
From: Bhushan Shah <bhush94@gmail.com>
Date: Tue, 24 Feb 2015 12:51:00 +0530
Subject: [PATCH 02/12] Set aboutData for plasmashell
Without AboutData kcrash is not able to send the bug reports to correct
product in bugzilla
REVIEW: 122704
---
shell/CMakeLists.txt | 1 +
shell/main.cpp | 16 ++++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index cb48ab8ed146a1f04b2125dd18e636f0b7cbca97..5d21ed924898fc045a0fcf51ab024a3c8c8624bd 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -79,6 +79,7 @@ target_link_libraries(plasmashell
KF5::IconThemes
KF5::Activities
KF5::GlobalAccel
+ KF5::CoreAddons
KF5::DBusAddons
KF5::Screen
KF5::Declarative
diff --git a/shell/main.cpp b/shell/main.cpp
index 005f908898b6a964b1a9a6df9e9507fddcca3a94..a4518ce6c89b297942f628d5e21b4d1a614480b2 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -22,6 +22,7 @@
#include <QQuickWindow>
#include <QSessionManager>
#include <QDebug>
+#include <KAboutData>
#include <kdbusservice.h>
#include <klocalizedstring.h>
@@ -45,10 +46,15 @@ int main(int argc, char *argv[])
KLocalizedString::setApplicationDomain("plasmashell");
QApplication app(argc, argv);
- app.setApplicationName("plasmashell");
- app.setApplicationDisplayName(i18n("Plasma"));
- app.setOrganizationDomain("kde.org");
- app.setApplicationVersion(PROJECT_VERSION);
+
+ KAboutData aboutData("plasmashell",
+ i18n("Plasma"),
+ QStringLiteral(PROJECT_VERSION),
+ i18n(description),
+ KAboutLicense::GPL);
+
+ KAboutData::setApplicationData(aboutData);
+
app.setQuitOnLastWindowClosed(false);
app.setWindowIcon(QIcon::fromTheme("plasma"));
@@ -93,6 +99,8 @@ int main(int argc, char *argv[])
cliOptions.process(app);
+ KAboutData::applicationData().setupCommandLine(&cliOptions);
+
if (cliOptions.isSet(shutupOption)) {
qInstallMsgHandler(noMessageOutput);
}
--
2.3.1

27
0005-lookandfeel-Make-sure-the-OSD-is-not-bigger-than-1-3.patch Normal file
View File

@ -0,0 +1,27 @@
From 2c733431d69a23cd6bea385116b74434d0538dbe Mon Sep 17 00:00:00 2001
From: Martin Klapetek <mklapetek@kde.org>
Date: Fri, 27 Feb 2015 14:16:06 +0100
Subject: [PATCH 05/12] [lookandfeel] Make sure the OSD is not bigger than 1/3
of the screen
REVIEW: 122738
---
lookandfeel/contents/osd/Osd.qml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lookandfeel/contents/osd/Osd.qml b/lookandfeel/contents/osd/Osd.qml
index b63338c2f94c074b405bba5509623ef38eef5350..ed936765dd43d0d237e61b6b742a32ff1dbaf808 100644
--- a/lookandfeel/contents/osd/Osd.qml
+++ b/lookandfeel/contents/osd/Osd.qml
@@ -38,7 +38,7 @@ PlasmaCore.Dialog {
property bool showingProgress: false
mainItem: Item {
- height: units.gridUnit * 15
+ height: Math.min(units.gridUnit * 15, Screen.desktopAvailableHeight / 3)
width: height
// /--------------------\
--
2.3.1

24
0006-Add-missing-import.patch Normal file
View File

@ -0,0 +1,24 @@
From 8af3b4084afc1d0959cd40378916b4f466ce92ed Mon Sep 17 00:00:00 2001
From: Martin Klapetek <mklapetek@kde.org>
Date: Fri, 27 Feb 2015 19:50:53 +0100
Subject: [PATCH 06/12] Add missing import
---
lookandfeel/contents/osd/Osd.qml | 1 +
1 file changed, 1 insertion(+)
diff --git a/lookandfeel/contents/osd/Osd.qml b/lookandfeel/contents/osd/Osd.qml
index ed936765dd43d0d237e61b6b742a32ff1dbaf808..d78f06b09c0d0492ea4c9f852a766cb0d7019b26 100644
--- a/lookandfeel/contents/osd/Osd.qml
+++ b/lookandfeel/contents/osd/Osd.qml
@@ -16,6 +16,7 @@
*/
import QtQuick 2.0
+import QtQuick.Window 2.2
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtra
--
2.3.1

27
0007-Don-t-set-mode-here-otherwise-default-will-not-work.patch Normal file
View File

@ -0,0 +1,27 @@
From c12f8ee26333c1ad7dc6c115a2a0dbfa3dc36975 Mon Sep 17 00:00:00 2001
From: Bhushan Shah <bhush94@gmail.com>
Date: Sun, 1 Mar 2015 21:38:03 +0530
Subject: [PATCH 07/12] Don't set mode here, otherwise default will not work
BUG: 344701
FIXED-IN: 5.2.2
---
lookandfeel/contents/components/LogoutOptions.qml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lookandfeel/contents/components/LogoutOptions.qml b/lookandfeel/contents/components/LogoutOptions.qml
index 50ead22d4502b80a391a5077b63e9d90040f89a6..22e9e8513d9e93c1b12c305407d9ea85096fcff3 100644
--- a/lookandfeel/contents/components/LogoutOptions.qml
+++ b/lookandfeel/contents/components/LogoutOptions.qml
@@ -32,7 +32,7 @@ PlasmaComponents.ButtonRow {
property bool canReboot
property bool canShutdown
property bool canLogout
- property string mode: "shutdown"
+ property string mode
onModeChanged: {
switch (mode) {
case "reboot":
--
2.3.1

31
0009-libtaskmanager-Use-the-icon-loaded-from-config-file-.patch Normal file
View File

@ -0,0 +1,31 @@
From b169753ce33bff5a4f8d0983226fec7790df85d8 Mon Sep 17 00:00:00 2001
From: Martin Klapetek <mklapetek@kde.org>
Date: Tue, 10 Mar 2015 18:31:50 +0100
Subject: [PATCH 09/12] [libtaskmanager] Use the icon loaded from config file
for launchers
This fixes launchers without .desktop files to not have icons in some
cases. The patch makes sure the icon that is read from the config file
is actually used for the launcher.
Reviewed-by: Eike Hein
---
libtaskmanager/groupmanager.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libtaskmanager/groupmanager.cpp b/libtaskmanager/groupmanager.cpp
index afac827f82bf498d2bf6acab8b340da9677c2f27..05e59ae64cce7ab4ff6b5090764e5df951af0dcd 100644
--- a/libtaskmanager/groupmanager.cpp
+++ b/libtaskmanager/groupmanager.cpp
@@ -1068,7 +1068,7 @@ void GroupManager::setLauncherList(QList<QUrl> launcherList)
l.setQuery(QUrlQuery());
- if (addLauncher(l, QIcon(), name, genericName, wmClass)) {
+ if (addLauncher(l, icon, name, genericName, wmClass)) {
urls << l;
}
}
--
2.3.1

55
0010-Take-Shown-and-Hidden-status-in-account-when-showing.patch Normal file
View File

@ -0,0 +1,55 @@
From 5b3b84b687a569731a74cc6cfa1284ebb5de169b Mon Sep 17 00:00:00 2001
From: Bhushan Shah <bhush94@gmail.com>
Date: Thu, 12 Mar 2015 17:37:58 +0530
Subject: [PATCH 10/12] Take Shown and Hidden status in account when showing
sidebar
- if clicked on arrow show sidebar
- if clicked on always hidden applet show sidebar
- if clicked on always shown applet hide sidebar
- in case of passive applet show sidebar
BUG: 344795
FIXED-IN: 5.2.2
---
.../package/contents/ui/ExpandedRepresentation.qml | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/applets/systemtray/package/contents/ui/ExpandedRepresentation.qml b/applets/systemtray/package/contents/ui/ExpandedRepresentation.qml
index abbb9701c4b87fb9e0cfc6781eec583a9c99f353..cc01f1ac46bfa781eadb6ee408c6884c0fe918df 100644
--- a/applets/systemtray/package/contents/ui/ExpandedRepresentation.qml
+++ b/applets/systemtray/package/contents/ui/ExpandedRepresentation.qml
@@ -84,14 +84,28 @@ Item {
model: host.hiddenTasks
delegate: TaskListDelegate {}
- visible: root.expandedTask == null || root.expandedTask.status == SystemTray.Task.Passive
+ visible: {
+ // Normal system tray case; clicked on arrow
+ if (root.expandedTask == null) {
+ return true;
+ // In case applet is hidden; we should show sidebar
+ } else if (plasmoid.configuration.hiddenItems.indexOf(root.expandedTask.taskId) != -1) {
+ return true;
+ // In case applet is shown; we should not show sidebar
+ } else if (plasmoid.configuration.shownItems.indexOf(root.expandedTask.taskId) != -1) {
+ return false;
+ }
+ // At last verify the passive status of applet
+ return root.expandedTask.status == SystemTray.Task.Passive;
+ }
+
}
PlasmaCore.SvgItem {
id: separator
width: lineSvg.elementSize("vertical-line").width;
- visible: root.expandedTask != null && root.expandedTask.status == SystemTray.Task.Passive
+ visible: root.expandedTask != null && hiddenView.visible
anchors {
left: parent.left
--
2.3.1

44
0011-Fix-displaying-label1-in-job-notifications.patch Normal file
View File

@ -0,0 +1,44 @@
From 6b462e70ec6072b9861b57e720407ada9a78ac80 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Thu, 12 Mar 2015 21:13:53 +0100
Subject: [PATCH 11/12] Fix displaying label1 in job notifications
Move label1 and labelName1 properties to correct place.
This fixes displaying second field in job description (eg. Destination).
REVIEW: 122916
---
applets/notifications/package/contents/ui/JobDelegate.qml | 2 ++
applets/notifications/package/contents/ui/JobDetailsItem.qml | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/applets/notifications/package/contents/ui/JobDelegate.qml b/applets/notifications/package/contents/ui/JobDelegate.qml
index a27b5abf5280772bd3d28026c68f7ba1cda7b4a4..4c792588e13ef8cb54f2a117f4cd2726a785519c 100644
--- a/applets/notifications/package/contents/ui/JobDelegate.qml
+++ b/applets/notifications/package/contents/ui/JobDelegate.qml
@@ -35,7 +35,9 @@ Column {
readonly property int animationDuration: units.shortDuration * 2
readonly property string labelName0: getData(jobsSource.data, "labelName0", '')
+ readonly property string labelName1: getData(jobsSource.data, "labelName1", '')
readonly property string label0: getData(jobsSource.data, "label0", '')
+ readonly property string label1: getData(jobsSource.data, "label1", '')
readonly property string jobstate: getData(jobsSource.data, "state", '')
function getData(data, name, defaultValue) {
diff --git a/applets/notifications/package/contents/ui/JobDetailsItem.qml b/applets/notifications/package/contents/ui/JobDetailsItem.qml
index 8b18356846990bbf5c19b5c2ba0e803aa019f357..52b950ec0ff73a82cf9cec1f68c4d0652283761c 100644
--- a/applets/notifications/package/contents/ui/JobDetailsItem.qml
+++ b/applets/notifications/package/contents/ui/JobDetailsItem.qml
@@ -32,8 +32,6 @@ Column {
spacing: jobItem.layoutSpacing
- readonly property string labelName1: jobItem.getData(jobsSource.data, "labelName1", '')
- readonly property string label1: jobItem.getData(jobsSource.data, "label1", '')
readonly property int eta: jobItem.getData(jobsSource.data, "eta", 0)
readonly property string speed: jobItem.getData(jobsSource.data, "speed", '')
--
2.3.1

34
0012-Show-pause-stop-buttons-in-jobs-notification-only-fo.patch Normal file
View File

@ -0,0 +1,34 @@
From 69fb206e395a9795648bd3e4ba28898f1c042c99 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Thu, 12 Mar 2015 21:34:53 +0100
Subject: [PATCH 12/12] Show pause/stop buttons in jobs notification only for
suspendable/killable jobs
REVIEW: 122920
---
applets/notifications/package/contents/ui/JobDelegate.qml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/applets/notifications/package/contents/ui/JobDelegate.qml b/applets/notifications/package/contents/ui/JobDelegate.qml
index 4c792588e13ef8cb54f2a117f4cd2726a785519c..d77290d68f1a5f12e0507a85fd10cb5fb64bea68 100644
--- a/applets/notifications/package/contents/ui/JobDelegate.qml
+++ b/applets/notifications/package/contents/ui/JobDelegate.qml
@@ -155,6 +155,7 @@ Column {
PlasmaComponents.ToolButton {
id: pauseButton
iconSource: jobItem.jobstate == "suspended" ? "media-playback-start" : "media-playback-pause"
+ visible: getData(jobsSource.data, "suspendable", 0)
onClicked: {
var operationName = "suspend"
@@ -170,6 +171,7 @@ Column {
PlasmaComponents.ToolButton {
id: stopButton
iconSource: "media-playback-stop"
+ visible: getData(jobsSource.data, "killable", 0)
onClicked: {
cancelledJobs.push(modelData) // register that it was user-cancelled
--
2.3.1

16
plasma5-workspace.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Mar 13 09:27:13 UTC 2015 - hrvoje.senjan@gmail.com
- Add patches from upstream:
0001-digital-clock-Invert-the-JS-timezone-offset-values.patch,
0002-Set-aboutData-for-plasmashell.patch,
0005-lookandfeel-Make-sure-the-OSD-is-not-bigger-than-1-3.patch,
0006-Add-missing-import.patch,
0007-Don-t-set-mode-here-otherwise-default-will-not-work.patch
(kde#344701),
0009-libtaskmanager-Use-the-icon-loaded-from-config-file-.patch,
0010-Take-Shown-and-Hidden-status-in-account-when-showing.patch
(kde#344795),
0011-Fix-displaying-label1-in-job-notifications.patch and
0012-Show-pause-stop-buttons-in-jobs-notification-only-fo.patch
-------------------------------------------------------------------
Fri Feb 20 02:44:04 UTC 2015 - hrvoje.senjan@gmail.com

22
plasma5-workspace.spec
View File

@ -32,8 +32,17 @@ Patch0: 0001-Rename-qdbus-in-startkde.patch
Patch1: create_kdehome.patch
# PATCH-FIX_OPENSUSE 0003-Remove-export-of-QT_PLUGIN_PATH.patch -- we install plugins to directory known to Qt5, so export just pollutes both Qt4 and Qt5 plugins
Patch2: 0003-Remove-export-of-QT_PLUGIN_PATH.patch
# PATCHES 100-1000 and above are from upstream 5.1 branch
# PATCHES 1000 and above are from upstream master/5.2 branch
# PATCHES 100-1000 and above are from upstream 5.2 branch
Patch100: 0001-digital-clock-Invert-the-JS-timezone-offset-values.patch
Patch101: 0002-Set-aboutData-for-plasmashell.patch
Patch102: 0005-lookandfeel-Make-sure-the-OSD-is-not-bigger-than-1-3.patch
Patch103: 0006-Add-missing-import.patch
Patch104: 0007-Don-t-set-mode-here-otherwise-default-will-not-work.patch
Patch105: 0009-libtaskmanager-Use-the-icon-loaded-from-config-file-.patch
Patch106: 0010-Take-Shown-and-Hidden-status-in-account-when-showing.patch
Patch107: 0011-Fix-displaying-label1-in-job-notifications.patch
Patch108: 0012-Show-pause-stop-buttons-in-jobs-notification-only-fo.patch
# PATCHES 1000 and above are from upstream master/5.3 branch
BuildRequires: alsa-devel
BuildRequires: baloo5-devel >= %{version}
BuildRequires: kactivities5-devel >= 5.6.0
@ -184,6 +193,15 @@ workspace. Development files.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1
%patch104 -p1
%patch105 -p1
%patch106 -p1
%patch107 -p1
%patch108 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5