Rex Dieter
9 years ago
parent
11330f8678
commit
ecc09847a3
@ -1,4 +1 @@
|
||||
/plasma-desktop-5.5.2.tar.xz
|
||||
/plasma-desktop-5.5.3.tar.xz
|
||||
/plasma-desktop-5.5.4.tar.xz
|
||||
/plasma-desktop-5.5.5.tar.xz
|
||||
/plasma-desktop-5.6.1.tar.xz
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
From fc9a550fbd0cb51f5342972948c38129de1bac35 Mon Sep 17 00:00:00 2001
|
||||
From: Eike Hein <hein@kde.org>
|
||||
Date: Sun, 27 Mar 2016 17:13:46 +0900
|
||||
Subject: [PATCH 44/46] Handle non-existing kickoffrc correctly.
|
||||
|
||||
BUG:357029
|
||||
---
|
||||
.../contents/updates/obsolete_kickoffrc.js | 24 ++++++++++++++--------
|
||||
1 file changed, 16 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/desktoppackage/contents/updates/obsolete_kickoffrc.js b/desktoppackage/contents/updates/obsolete_kickoffrc.js
|
||||
index a3e6e9f..b95dd46 100644
|
||||
--- a/desktoppackage/contents/updates/obsolete_kickoffrc.js
|
||||
+++ b/desktoppackage/contents/updates/obsolete_kickoffrc.js
|
||||
@@ -1,18 +1,26 @@
|
||||
var kickoffConfig = ConfigFile("kickoffrc");
|
||||
|
||||
kickoffConfig.group = "Favorites";
|
||||
-var favorites = kickoffConfig.readEntry("FavoriteURLs").split(',');
|
||||
+var favorites = kickoffConfig.readEntry("FavoriteURLs");
|
||||
+var haveFavorites = (favorites.length > 0);
|
||||
+
|
||||
+if (haveFavorites) {
|
||||
+ favorites = favorites.split(',');
|
||||
+}
|
||||
|
||||
kickoffConfig.group = "SystemApplications";
|
||||
-var systemApplications = kickoffConfig.readEntry("DesktopFiles").split(',');
|
||||
+var systemApplications = kickoffConfig.readEntry("DesktopFiles");
|
||||
+var haveSystemApplications = (systemApplications.length > 0);
|
||||
+
|
||||
+if (haveSystemApplications) {
|
||||
+ systemApplications = systemApplications.split(',');
|
||||
|
||||
-if (systemApplications.length) {
|
||||
// This used to be hardcoded in Kickoff C++ code; it's now the KConfigXT
|
||||
// default but needs to be added in when migrating from the rc file.
|
||||
systemApplications.unshift("systemsettings.desktop");
|
||||
}
|
||||
|
||||
-if (favorites.length || systemApplications.length) {
|
||||
+if (haveFavorites || haveSystemApplications) {
|
||||
for (var i in panels()) {
|
||||
var panel = panels()[i];
|
||||
|
||||
@@ -22,11 +30,11 @@ if (favorites.length || systemApplications.length) {
|
||||
if (widget.type == "org.kde.plasma.kickoff") {
|
||||
widget.currentConfigGroup = ["General"];
|
||||
|
||||
- if (favorites.length) {
|
||||
+ if (haveFavorites) {
|
||||
widget.writeConfig("favorites", favorites);
|
||||
}
|
||||
|
||||
- if (systemApplications.length) {
|
||||
+ if (haveSystemApplications) {
|
||||
widget.writeConfig("systemApplications", systemApplications);
|
||||
}
|
||||
}
|
||||
@@ -42,11 +50,11 @@ if (favorites.length || systemApplications.length) {
|
||||
if (widget.type == "org.kde.plasma.kickoff") {
|
||||
widget.currentConfigGroup = ["General"];
|
||||
|
||||
- if (favorites.length) {
|
||||
+ if (haveFavorites) {
|
||||
widget.writeConfig("favorites", favorites);
|
||||
}
|
||||
|
||||
- if (systemApplications.length) {
|
||||
+ if (haveSystemApplications) {
|
||||
widget.writeConfig("systemApplications", systemApplications);
|
||||
}
|
||||
}
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
From bc28403a08c81d2c07c4582622d9c138ede24704 Mon Sep 17 00:00:00 2001
|
||||
From: Eike Hein <hein@kde.org>
|
||||
Date: Sun, 27 Mar 2016 17:03:57 +0900
|
||||
Subject: [PATCH 1/2] Set config group.
|
||||
|
||||
BUG:357029
|
||||
---
|
||||
desktoppackage/contents/updates/obsolete_kickoffrc.js | 16 ++++++++++------
|
||||
1 file changed, 10 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/desktoppackage/contents/updates/obsolete_kickoffrc.js b/desktoppackage/contents/updates/obsolete_kickoffrc.js
|
||||
index d92cae9..a3e6e9f 100644
|
||||
--- a/desktoppackage/contents/updates/obsolete_kickoffrc.js
|
||||
+++ b/desktoppackage/contents/updates/obsolete_kickoffrc.js
|
||||
@@ -6,13 +6,13 @@ var favorites = kickoffConfig.readEntry("FavoriteURLs").split(',');
|
||||
kickoffConfig.group = "SystemApplications";
|
||||
var systemApplications = kickoffConfig.readEntry("DesktopFiles").split(',');
|
||||
|
||||
-if (systemApplications) {
|
||||
+if (systemApplications.length) {
|
||||
// This used to be hardcoded in Kickoff C++ code; it's now the KConfigXT
|
||||
// default but needs to be added in when migrating from the rc file.
|
||||
systemApplications.unshift("systemsettings.desktop");
|
||||
}
|
||||
|
||||
-if (favorites || systemApplications) {
|
||||
+if (favorites.length || systemApplications.length) {
|
||||
for (var i in panels()) {
|
||||
var panel = panels()[i];
|
||||
|
||||
@@ -20,11 +20,13 @@ if (favorites || systemApplications) {
|
||||
var widget = panel.widgetById(panel.widgetIds[j]);
|
||||
|
||||
if (widget.type == "org.kde.plasma.kickoff") {
|
||||
- if (favorites) {
|
||||
+ widget.currentConfigGroup = ["General"];
|
||||
+
|
||||
+ if (favorites.length) {
|
||||
widget.writeConfig("favorites", favorites);
|
||||
}
|
||||
|
||||
- if (systemApplications) {
|
||||
+ if (systemApplications.length) {
|
||||
widget.writeConfig("systemApplications", systemApplications);
|
||||
}
|
||||
}
|
||||
@@ -38,11 +40,13 @@ if (favorites || systemApplications) {
|
||||
var widget = desktop.widgetById(desktop.widgetIds[j]);
|
||||
|
||||
if (widget.type == "org.kde.plasma.kickoff") {
|
||||
- if (favorites) {
|
||||
+ widget.currentConfigGroup = ["General"];
|
||||
+
|
||||
+ if (favorites.length) {
|
||||
widget.writeConfig("favorites", favorites);
|
||||
}
|
||||
|
||||
- if (systemApplications) {
|
||||
+ if (systemApplications.length) {
|
||||
widget.writeConfig("systemApplications", systemApplications);
|
||||
}
|
||||
}
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From: David Rosca <nowrep@gmail.com>
|
||||
Date: Fri, 19 Feb 2016 16:20:00 +0100
|
||||
Subject: [PATCH 519/545] TaskManager: Don't use Plasma theme icons in task
|
||||
icon
|
||||
|
||||
Summary:
|
||||
Also disable animation for icon in tooltip (normal Plasma tooltips
|
||||
no longer have animated icon too).
|
||||
|
||||
BUG: 359387
|
||||
|
||||
Reviewers: #plasma, hein
|
||||
|
||||
Reviewed By: hein
|
||||
|
||||
Subscribers: plasma-devel
|
||||
|
||||
Projects: #plasma
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D991
|
||||
--
|
||||
diff -up plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/Task.qml.0519 plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/Task.qml
|
||||
--- plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/Task.qml.0519 2016-02-29 11:45:49.595021502 -0600
|
||||
+++ plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/Task.qml 2016-02-29 11:49:00.288093610 -0600
|
||||
@@ -270,6 +270,7 @@ MouseArea {
|
||||
|
||||
active: task.containsMouse || task.showingContextMenu
|
||||
enabled: true
|
||||
+ usesPlasmaTheme: false
|
||||
|
||||
source: model.DecorationRole
|
||||
|
||||
diff -up plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml.0519 plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml
|
||||
--- plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml.0519 2016-01-26 13:39:46.000000000 -0600
|
||||
+++ plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml 2016-02-29 11:45:49.595021502 -0600
|
||||
@@ -142,6 +142,8 @@ Column {
|
||||
x: _s
|
||||
width: units.iconSizes.desktop
|
||||
height: width
|
||||
+ animated: false
|
||||
+ usesPlasmaTheme: false
|
||||
source: icon
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue