summaryrefslogtreecommitdiffstats
path: root/source/kde/kde/patch/ark
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde/kde/patch/ark')
-rw-r--r--source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch36
-rw-r--r--source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch43
2 files changed, 0 insertions, 79 deletions
diff --git a/source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch b/source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch
deleted file mode 100644
index 3144292e7..000000000
--- a/source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 015bdfd1de9135279c7662eb89acc81d1a843202 Mon Sep 17 00:00:00 2001
-From: 2155X 2155X <syenergyyy@gmail.com>
-Date: Tue, 7 Dec 2021 01:12:35 +0200
-Subject: [PATCH] Fix extraction "Dolphin Actions" not abiding "Open
- destination folder after extracting" setting.
-
-BUG: 319134
-CCBUG: 298248
-
-
-(cherry picked from commit 6b3b77e81a05154204ca89140afbec2021ea431b)
----
- app/extractfileitemaction.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/app/extractfileitemaction.cpp b/app/extractfileitemaction.cpp
-index b714cee6..cd6b6f96 100644
---- a/app/extractfileitemaction.cpp
-+++ b/app/extractfileitemaction.cpp
-@@ -14,6 +14,7 @@
- #include <KLocalizedString>
- #include <KPluginFactory>
-
-+#include "settings.h"
- #include "mimetypes.h"
- #include "pluginmanager.h"
- #include "batchextract.h"
-@@ -96,7 +97,7 @@ QAction *ExtractFileItemAction::createAction(const QIcon& icon, const QString& n
- connect(action, &QAction::triggered, this, [urls,name, option, parent,this]() {
- auto *batchExtractJob = new BatchExtract(parent);
- batchExtractJob->setDestinationFolder(QFileInfo(urls.first().toLocalFile()).path());
-- batchExtractJob->setOpenDestinationAfterExtraction(true);
-+ batchExtractJob->setOpenDestinationAfterExtraction(ArkSettings::openDestinationFolderAfterExtraction());
- if (option == AutoSubfolder) {
- batchExtractJob->setAutoSubfolder(true);
- } else if (option == ShowDialog) {
diff --git a/source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch b/source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch
deleted file mode 100644
index 764708e2b..000000000
--- a/source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 75c6927883342ec533aea4663b7b5dfcf8d699a6 Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Sat, 25 Dec 2021 13:00:29 +0100
-Subject: [PATCH] Do not highlight file after compression
-
-Dolphin opens a new tab whenever the file is compressed and
-is not smart enough to highlight it in the currently open view.
-Because people are annoyed by it and the alternatives are complex to implement,
-removing it is the best solution.
-
-BUG: 440663
-
-
-(cherry picked from commit 28f2ef4b22f53200cb8789dbc8fe8ecdba3a377f)
----
- app/compressfileitemaction.cpp | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/app/compressfileitemaction.cpp b/app/compressfileitemaction.cpp
-index 45e75a6e..692a7195 100644
---- a/app/compressfileitemaction.cpp
-+++ b/app/compressfileitemaction.cpp
-@@ -16,7 +16,6 @@
- #include <KPluginFactory>
-
- #include <algorithm>
--#include <KIO/OpenFileManagerWindowJob>
-
- #include "pluginmanager.h"
- #include "addtoarchive.h"
-@@ -102,10 +101,8 @@ QAction *CompressFileItemAction::createAction(const QIcon& icon, const QString&
- }
- }
- addToArchiveJob->start();
-- connect(addToArchiveJob, &KJob::finished, this, [this, addToArchiveJob](){
-- if (addToArchiveJob->error() == 0) {
-- KIO::highlightInFileManager({QUrl::fromLocalFile(addToArchiveJob->fileName())});
-- } else if (!addToArchiveJob->errorString().isEmpty()) {
-+ connect(addToArchiveJob, &KJob::finished, this, [this, addToArchiveJob]() {
-+ if (addToArchiveJob->error() != 0) {
- Q_EMIT error(addToArchiveJob->errorString());
- }
- });