Dan Vrátil
10 years ago
parent
c9a8901ade
commit
0f737b3246
@ -1 +1,2 @@
|
||||
/plasma-desktop-5.3.1.tar.xz
|
||||
/plasma-desktop-5.3.2.tar.xz
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From a44392b54ca3e8fa7250537c7d7a9f4004c6af03 Mon Sep 17 00:00:00 2001
|
||||
From: Kai Uwe Broulik <kde@privat.broulik.de>
|
||||
Date: Wed, 10 Jun 2015 13:07:27 +0200
|
||||
Subject: [PATCH 14/15] Fix dropping files onto the desktop containment
|
||||
|
||||
REVIEW: 124055
|
||||
FIXED-IN: 5.3.2
|
||||
BUG: 346867
|
||||
---
|
||||
containments/desktop/package/contents/ui/main.qml | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml
|
||||
index 7fd7481..1df2720 100644
|
||||
--- a/containments/desktop/package/contents/ui/main.qml
|
||||
+++ b/containments/desktop/package/contents/ui/main.qml
|
||||
@@ -180,9 +180,7 @@ DragDrop.DropArea {
|
||||
folderViewLayer.view.scrollRight = (event.x > width - (units.largeSpacing * 3));
|
||||
folderViewLayer.view.scrollUp = (event.y < (units.largeSpacing * 3));
|
||||
folderViewLayer.view.scrollDown = (event.y > height - (units.largeSpacing * 3));
|
||||
- }
|
||||
-
|
||||
- if (isContainment && !event.mimeData.hasUrls) {
|
||||
+ } else if (isContainment) {
|
||||
placeHolder.width = LayoutManager.defaultAppletSize.width;
|
||||
placeHolder.height = LayoutManager.defaultAppletSize.height;
|
||||
placeHolder.x = event.x - placeHolder.width / 2;
|
||||
@@ -216,9 +214,7 @@ DragDrop.DropArea {
|
||||
folderViewLayer.view.scrollDown = false;
|
||||
|
||||
folderViewLayer.view.drop(root, event, mapToItem(folderViewLayer.view, event.x, event.y));
|
||||
- }
|
||||
-
|
||||
- if (isContainment && !event.mimeData.hasUrls) {
|
||||
+ } else if (isContainment) {
|
||||
placeHolderPaint.opacity = 0;
|
||||
plasmoid.processMimeData(event.mimeData, event.x - placeHolder.width / 2, event.y - placeHolder.height / 2);
|
||||
}
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From f0d4cce819b3ce683a11b49a93ba81bafef7a4dd Mon Sep 17 00:00:00 2001
|
||||
From: Bhushan Shah <bhush94@gmail.com>
|
||||
Date: Tue, 16 Jun 2015 17:35:00 +0530
|
||||
Subject: [PATCH 15/15] Remove X-KDE-Library from the trash library
|
||||
|
||||
trash applet is not using the c++ applet part, so remove it
|
||||
|
||||
BUG: 349207
|
||||
---
|
||||
applets/trash/package/metadata.desktop | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/applets/trash/package/metadata.desktop b/applets/trash/package/metadata.desktop
|
||||
index 48f1da5..b0436d4 100644
|
||||
--- a/applets/trash/package/metadata.desktop
|
||||
+++ b/applets/trash/package/metadata.desktop
|
||||
@@ -82,7 +82,6 @@ X-KDE-ServiceTypes=Plasma/Applet
|
||||
X-Plasma-API=declarativeappletscript
|
||||
X-Plasma-MainScript=ui/main.qml
|
||||
|
||||
-X-KDE-Library=plasma_applet_trash
|
||||
X-KDE-PluginInfo-Author=Heena
|
||||
X-KDE-PluginInfo-Email=heena393@gmail.com
|
||||
X-KDE-PluginInfo-Name=org.kde.plasma.trash
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 4b576cd02867672069c8077a43bb7caf442de8cc Mon Sep 17 00:00:00 2001
|
||||
From: Bernie Innocenti <bernie@codewiz.org>
|
||||
Date: Wed, 17 Jun 2015 10:26:46 -0700
|
||||
Subject: [PATCH 18/18] Don't overwrite audio profile entries with same
|
||||
priority
|
||||
|
||||
REVIEW: 124108
|
||||
---
|
||||
kcms/phonon/audiosetup.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kcms/phonon/audiosetup.h b/kcms/phonon/audiosetup.h
|
||||
index dfb25bf..72fb2be 100644
|
||||
--- a/kcms/phonon/audiosetup.h
|
||||
+++ b/kcms/phonon/audiosetup.h
|
||||
@@ -33,7 +33,7 @@ typedef struct {
|
||||
quint32 index;
|
||||
QString name;
|
||||
QString icon;
|
||||
- QMap<quint32, QPair<QString, QString> > profiles;
|
||||
+ QMultiMap<quint32, QPair<QString, QString> > profiles;
|
||||
QString activeProfile;
|
||||
} cardInfo;
|
||||
|
||||
--
|
||||
2.4.3
|
||||
|
||||
Loading…
Reference in new issue