diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
commit | 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch) | |
tree | 8c816148bcbd22757d892089c989ae614eae4f5a /kde-frameworks/kio/files | |
parent | 0f558761aa2dee1017b4751e4017205e015a9560 (diff) |
gentoo resync : 09.07.2022
Diffstat (limited to 'kde-frameworks/kio/files')
-rw-r--r-- | kde-frameworks/kio/files/kio-5.95.0-filewidgets-update-filename-after-rename.patch | 76 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.95.0-fix-recent-files-in-gtk-apps.patch | 25 |
2 files changed, 101 insertions, 0 deletions
diff --git a/kde-frameworks/kio/files/kio-5.95.0-filewidgets-update-filename-after-rename.patch b/kde-frameworks/kio/files/kio-5.95.0-filewidgets-update-filename-after-rename.patch new file mode 100644 index 000000000000..5cf7b9f2fb45 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.95.0-filewidgets-update-filename-after-rename.patch @@ -0,0 +1,76 @@ +From 6d47b5869d4b328614e5e95e97ef66d97009295e Mon Sep 17 00:00:00 2001 +From: Fushan Wen <qydwhotmail@gmail.com> +Date: Wed, 15 Jun 2022 22:03:27 +0800 +Subject: [PATCH] filewidgets: update location text after selected files are + renamed + +Before this commit, the location text is not updated after the selected +files are renamed. + +BUG: 455327 +--- + src/filewidgets/kdiroperator.cpp | 3 ++- + src/filewidgets/kdiroperator.h | 9 +++++++++ + src/filewidgets/kfilewidget.cpp | 4 ++++ + 3 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/src/filewidgets/kdiroperator.cpp b/src/filewidgets/kdiroperator.cpp +index c7a1c9350..adacfda60 100644 +--- a/src/filewidgets/kdiroperator.cpp ++++ b/src/filewidgets/kdiroperator.cpp +@@ -889,8 +889,9 @@ void KDirOperator::renameSelected() + } + + KIO::RenameFileDialog *dialog = new KIO::RenameFileDialog(items, this); +- connect(dialog, &KIO::RenameFileDialog::renamingFinished, this, [this]() { ++ connect(dialog, &KIO::RenameFileDialog::renamingFinished, this, [this](const QList<QUrl> &urls) { + d->assureVisibleSelection(); ++ Q_EMIT renamingFinished(urls); + }); + + dialog->open(); +diff --git a/src/filewidgets/kdiroperator.h b/src/filewidgets/kdiroperator.h +index cb9668fb7..a15e90765 100644 +--- a/src/filewidgets/kdiroperator.h ++++ b/src/filewidgets/kdiroperator.h +@@ -824,6 +824,7 @@ public Q_SLOTS: + /** + * Initiates a rename operation on the currently selected files/directories, + * prompting the user to choose a new name(s) for the currently selected items ++ * @see renamingFinished + * @since 5.67 + */ + void renameSelected(); +@@ -991,6 +992,14 @@ Q_SIGNALS: + */ + void keyEnterReturnPressed(); + ++ /** ++ * Emitted when renaming selected files has finished. ++ * ++ * @param urls URL list of the renamed files ++ * @since 5.96 ++ */ ++ void renamingFinished(const QList<QUrl> &urls); ++ + private: + friend class KDirOperatorPrivate; + std::unique_ptr<KDirOperatorPrivate> d; +diff --git a/src/filewidgets/kfilewidget.cpp b/src/filewidgets/kfilewidget.cpp +index 943c0cd93..d0825dfaa 100644 +--- a/src/filewidgets/kfilewidget.cpp ++++ b/src/filewidgets/kfilewidget.cpp +@@ -1185,6 +1185,10 @@ void KFileWidgetPrivate::initDirOpWidgets() + q->connect(m_ops, &KDirOperator::keyEnterReturnPressed, q, [this]() { + slotViewKeyEnterReturnPressed(); + }); ++ q->connect(m_ops, &KDirOperator::renamingFinished, q, [this](const QList<QUrl> &urls) { ++ // Update file names in location text field after renaming selected files ++ q->setSelectedUrls(urls); ++ }); + + m_ops->dirLister()->setAutoErrorHandlingEnabled(false); + q->connect(m_ops->dirLister(), &KDirLister::jobError, q, [this](KIO::Job *job) { +-- +GitLab + diff --git a/kde-frameworks/kio/files/kio-5.95.0-fix-recent-files-in-gtk-apps.patch b/kde-frameworks/kio/files/kio-5.95.0-fix-recent-files-in-gtk-apps.patch new file mode 100644 index 000000000000..524fdc871fc8 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.95.0-fix-recent-files-in-gtk-apps.patch @@ -0,0 +1,25 @@ +From 0dd0e96c10f634974c63f85c2068e44019c27591 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven@kdemail.net> +Date: Wed, 29 Jun 2022 10:14:50 +0200 +Subject: [PATCH] KRecentDocuments: Improve indentation in recentlyused.xbel + +BUG: 456046 +--- + src/core/krecentdocument.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/core/krecentdocument.cpp b/src/core/krecentdocument.cpp +index 23fcbbd09..87d276b06 100644 +--- a/src/core/krecentdocument.cpp ++++ b/src/core/krecentdocument.cpp +@@ -270,6 +270,7 @@ static bool addToXbel(const QUrl &url, const QString &desktopEntryName, KRecentD + + if (!foundExisting) { + // must create new bookmark tag ++ output.writeCharacters(QStringLiteral(" ")); + output.writeStartElement(bookmarkTag); + + output.writeAttribute(hrefAttribute, newUrl); +-- +GitLab + |