Hello community, here is the log from the commit of package dolphin for openSUSE:Factory checked in at 2018-10-01 08:13:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dolphin (Old) and /work/SRC/openSUSE:Factory/.dolphin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dolphin" Mon Oct 1 08:13:45 2018 rev:45 rq:638861 version:18.08.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dolphin/dolphin.changes 2018-09-13 23:54:07.470287041 +0200 +++ /work/SRC/openSUSE:Factory/.dolphin.new/dolphin.changes 2018-10-01 08:13:49.430106390 +0200 @@ -1,0 +2,8 @@ +Thu Sep 27 14:54:59 UTC 2018 - [email protected] + +- Add Dont-assign-twice-the-same-key-to-the-action-New-Tab.patch to + avoid an "Ambiguous shortcuts" error on startup when running + dolphin on a different desktop than Plasma + (boo#1109372, kde#398324) + +------------------------------------------------------------------- New: ---- Dont-assign-twice-the-same-key-to-the-action-New-Tab.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dolphin.spec ++++++ --- /var/tmp/diff_new_pack.pvIx94/_old 2018-10-01 08:13:49.990106029 +0200 +++ /var/tmp/diff_new_pack.pvIx94/_new 2018-10-01 08:13:49.990106029 +0200 @@ -33,6 +33,8 @@ 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 BuildRequires: baloo5-devel BuildRequires: baloo5-widgets-devel BuildRequires: extra-cmake-modules >= 1.6.0 @@ -120,8 +122,7 @@ %prep %setup -q -n dolphin-%{version} -%patch0 -p1 -%patch1 -p1 +%autopatch -p1 %build %cmake_kf5 -d build ++++++ Dont-assign-twice-the-same-key-to-the-action-New-Tab.patch ++++++ >From 9991eb0f5eaf38aa7f0c61206937d4cd013e24c8 Mon Sep 17 00:00:00 2001 From: Jaime Torres Amate <[email protected]> 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<void(DolphinMainWindow::*)()>(&DolphinMainWindow::openNewActivatedTab)); QAction* closeTab = KStandardAction::close( -- cgit v0.11.2
