|
|
|
@ -1,33 +1,17 @@
|
|
|
|
|
From 771e57f3b2c19f4e6f867c01c2457ec87531b4cf Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Kai Uwe Broulik <kde@privat.broulik.de>
|
|
|
|
|
Date: Tue, 31 Jan 2017 15:07:42 +0100
|
|
|
|
|
Subject: [Folder View] show script execution prompt when clicking item
|
|
|
|
|
|
|
|
|
|
When clicking a file in FolderView, we should ask for whether to open or run a script depending on user settings.
|
|
|
|
|
This is what Dolphin does.
|
|
|
|
|
|
|
|
|
|
BUG: 375793
|
|
|
|
|
FIXED-IN: 5.8.6
|
|
|
|
|
|
|
|
|
|
Differential Revision: https://phabricator.kde.org/D4367
|
|
|
|
|
---
|
|
|
|
|
containments/desktop/plugins/folder/foldermodel.cpp | 3 ++-
|
|
|
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/containments/desktop/plugins/folder/foldermodel.cpp b/containments/desktop/plugins/folder/foldermodel.cpp
|
|
|
|
|
index 758f7f3..1ba1245 100644
|
|
|
|
|
--- a/containments/desktop/plugins/folder/foldermodel.cpp
|
|
|
|
|
+++ b/containments/desktop/plugins/folder/foldermodel.cpp
|
|
|
|
|
@@ -509,7 +509,8 @@ void FolderModel::run(int row)
|
|
|
|
|
diff -up plasma-desktop-5.8.5/containments/desktop/plugins/folder/foldermodel.cpp.than plasma-desktop-5.8.5/containments/desktop/plugins/folder/foldermodel.cpp
|
|
|
|
|
--- plasma-desktop-5.8.5/containments/desktop/plugins/folder/foldermodel.cpp.than 2017-02-13 17:02:37.079245114 +0100
|
|
|
|
|
+++ plasma-desktop-5.8.5/containments/desktop/plugins/folder/foldermodel.cpp 2017-02-13 17:46:04.152443288 +0100
|
|
|
|
|
@@ -509,7 +509,12 @@ void FolderModel::run(int row)
|
|
|
|
|
url.setScheme(QStringLiteral("file"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- new KRun(url, 0);
|
|
|
|
|
+ KRun *run = new KRun(url, 0);
|
|
|
|
|
+ run->setShowScriptExecutionPrompt(true);
|
|
|
|
|
+ // On desktop:/ we want to be able to run .desktop files right away,
|
|
|
|
|
+ // otherwise ask for security reasons. We also don't use the targetUrl()
|
|
|
|
|
+ // from above since we don't want the resolved /home/foo/Desktop URL.
|
|
|
|
|
+ run->setShowScriptExecutionPrompt(item.url().scheme() != QLatin1String("desktop")
|
|
|
|
|
+ || item.url().adjusted(QUrl::RemoveFilename).path() != QLatin1String("/"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void FolderModel::rename(int row, const QString& name)
|
|
|
|
|
--
|
|
|
|
|
cgit v0.11.2
|
|
|
|
|
|
|
|
|
|