From 8c7d88b9057d09b9b06ceae51d61d4916521d09223dacf57689ba3819d67141e Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 12 Oct 2018 08:43:44 +0000 Subject: [PATCH] KDE Applications 18.08.2 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/dolphin?expand=0&rev=150 --- ...e-the-same-key-to-the-action-New-Tab.patch | 46 --------------- ...ing-a-file-can-trigger-inline-rename.patch | 56 ------------------- dolphin-18.08.1.tar.xz | 3 - dolphin-18.08.2.tar.xz | 3 + dolphin.changes | 28 ++++++++++ dolphin.spec | 8 +-- 6 files changed, 33 insertions(+), 111 deletions(-) delete mode 100644 Dont-assign-twice-the-same-key-to-the-action-New-Tab.patch delete mode 100644 Fix-that-dragging-a-file-can-trigger-inline-rename.patch delete mode 100644 dolphin-18.08.1.tar.xz create mode 100644 dolphin-18.08.2.tar.xz diff --git a/Dont-assign-twice-the-same-key-to-the-action-New-Tab.patch b/Dont-assign-twice-the-same-key-to-the-action-New-Tab.patch deleted file mode 100644 index 9f0e385..0000000 --- a/Dont-assign-twice-the-same-key-to-the-action-New-Tab.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9991eb0f5eaf38aa7f0c61206937d4cd013e24c8 Mon Sep 17 00:00:00 2001 -From: Jaime Torres Amate -Date: Mon, 10 Sep 2018 16:45:45 +0200 -Subject: Don't assign twice the same key to the action New Tab - -Summary: -QKeySequence::AddTab = Qt::CTRL + Qt::Key_T. -Leaving only the first avoids the warning window "There are two actions (New Tab, New Tab) that want to use the same shortcut (Ctrl+T)" - -BUG: 398324 - -Test Plan: -su - test -unset KDE_FULL_SESSION -dolphin -After: No more the warning window. - -Reviewers: #dolphin, elvisangelaccio - -Reviewed By: #dolphin, elvisangelaccio - -Subscribers: elvisangelaccio, kfm-devel - -Tags: #dolphin - -Differential Revision: https://phabricator.kde.org/D15371 ---- - src/dolphinmainwindow.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp -index f8b35d4..a862ae8 100644 ---- a/src/dolphinmainwindow.cpp -+++ b/src/dolphinmainwindow.cpp -@@ -1079,7 +1079,7 @@ void DolphinMainWindow::setupActions() - QAction* newTab = actionCollection()->addAction(QStringLiteral("new_tab")); - newTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-new"))); - newTab->setText(i18nc("@action:inmenu File", "New Tab")); -- actionCollection()->setDefaultShortcuts(newTab, {Qt::CTRL + Qt::Key_T, QKeySequence::AddTab}); -+ actionCollection()->setDefaultShortcuts(newTab, {QKeySequence::AddTab}); - connect(newTab, &QAction::triggered, this, static_cast(&DolphinMainWindow::openNewActivatedTab)); - - QAction* closeTab = KStandardAction::close( --- -cgit v0.11.2 - diff --git a/Fix-that-dragging-a-file-can-trigger-inline-rename.patch b/Fix-that-dragging-a-file-can-trigger-inline-rename.patch deleted file mode 100644 index dd31335..0000000 --- a/Fix-that-dragging-a-file-can-trigger-inline-rename.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ddfc86ab8c207b81ec9ac83167d081b8d01c2750 Mon Sep 17 00:00:00 2001 -From: Andreas Krutzler -Date: Tue, 2 Oct 2018 20:25:57 +0200 -Subject: Fix that dragging a file can trigger inline rename. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Summary: -Inline renaming is aborted as soon as an item is dragged. Previously, ’m_dragging' was used to determine if an item was being dragged. However, inline renaming is triggered after a certain amount of -time, during which time the user may have stopped dragging items. - -BUG: 398375 -FIXED-IN: 18.08.2 - -Test Plan: When dragging an selected item, inline renaming should never be started, regardless of where you drag it (Places panel, other split-view window, out of the Dolphin window, ...). - -Reviewers: wbauer, elvisangelaccio, #dolphin, ngraham - -Reviewed By: wbauer, elvisangelaccio, #dolphin, ngraham - -Subscribers: kfm-devel - -Tags: #dolphin - -Differential Revision: https://phabricator.kde.org/D15904 ---- - src/views/dolphinview.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp -index 342c226..1db62b8 100644 ---- a/src/views/dolphinview.cpp -+++ b/src/views/dolphinview.cpp -@@ -755,6 +755,7 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event) - case QEvent::GraphicsSceneDragEnter: - if (watched == m_view) { - m_dragging = true; -+ abortTwoClicksRenaming(); - } - break; - -@@ -1432,8 +1433,8 @@ void DolphinView::slotTwoClicksRenamingTimerTimeout() - { - const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); - -- // verify that only one item is selected and that no item is dragged -- if (selectionManager->selectedItems().count() == 1 && !m_dragging) { -+ // verify that only one item is selected -+ if (selectionManager->selectedItems().count() == 1) { - const int index = selectionManager->currentItem(); - const QUrl fileItemUrl = m_model->fileItem(index).url(); - --- -cgit v0.11.2 - diff --git a/dolphin-18.08.1.tar.xz b/dolphin-18.08.1.tar.xz deleted file mode 100644 index b123fe5..0000000 --- a/dolphin-18.08.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d29f2cb3db040f042d4a0c8fcc6712e55d350bb77e3527c1b7b5bc59c2081cb9 -size 4859496 diff --git a/dolphin-18.08.2.tar.xz b/dolphin-18.08.2.tar.xz new file mode 100644 index 0000000..e757e73 --- /dev/null +++ b/dolphin-18.08.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d79d289735822dfc27917917ee7c92284d1f846696773ed66da2102617e9451 +size 4859700 diff --git a/dolphin.changes b/dolphin.changes index 7df2be5..2acf085 100644 --- a/dolphin.changes +++ b/dolphin.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Thu Oct 11 20:06:44 UTC 2018 - lbeltrame@kde.org + +- Update to 18.08.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.08.2.php +- Changes since 18.08.1: + * [PlacesItemModelTest] More index-related fixes + * [PlacesItemModel] Fix testSystemItems() + * [PlacesItemModelTest] Fix testHideItem() + * [PlacesItemModelTest] Fix testTearDownDevice() + * [PlacesItemModelTest] Fix testDeletePlace() + * [PlacesItemModelTest] Fix testGroups() test case + * Follow-up of commit 9760f9607d + * [PlacesItemModelTest] Check whether Desktop and Download folders exist + * Fix disabling of DolphinNewFileMenu + * Add test cases for enabled status of DolphinNewFileMenu + * Fix that dragging a file can trigger inline rename. (kde#398375) + * Don't assign twice the same key to the action New Tab (kde#398324) + * Do use QIcon::Selected for non-icon view + * [KStandardItemListWidget] Round to icon size before applying scaling + * Correctly save behaviourOnLaunch (kde#398022) + * Don't use QIcon::Selected state for selected icon (kde#398014) +- Dropped patches, now upstream: + * Fix-that-dragging-a-file-can-trigger-inline-rename.patch + * Dont-assign-twice-the-same-key-to-the-action-New-Tab.patch + ------------------------------------------------------------------- Wed Oct 3 21:08:35 UTC 2018 - wbauer@tmo.at diff --git a/dolphin.spec b/dolphin.spec index a7382d3..8408d43 100644 --- a/dolphin.spec +++ b/dolphin.spec @@ -12,14 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %bcond_without lang Name: dolphin -Version: 18.08.1 +Version: 18.08.2 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) @@ -33,10 +33,6 @@ Source1: dolphinsu.desktop Patch0: dolphin-go_up.diff # PATCH-FIX-OPENSUSE Patch1: 0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch -# PATCH-FIX-UPSTREAM -Patch2: Dont-assign-twice-the-same-key-to-the-action-New-Tab.patch -# PATCH-FIX-UPSTREAM -Patch3: Fix-that-dragging-a-file-can-trigger-inline-rename.patch BuildRequires: baloo5-devel BuildRequires: baloo5-widgets-devel BuildRequires: extra-cmake-modules >= 1.6.0