Fix Wayland window activation when attaching to an existing instance

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 65d84106067b2b7123ac80d09d7e23e65297fc27..fbc0d75d2a9d182cfcb9e47df45300d4e5cd4b96 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -28,15 +28,12 @@
 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KNewFileMenu>
-#include <KPluginMetaData>
 #include <KStandardAction>
-#include <KToolBar>
+#include <kio_version.h>
 
 #include <QApplication>
 #include <QClipboard>
 #include <QKeyEvent>
-#include <QMenuBar>
-#include <QMimeDatabase>
 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const KFileItem& fileInfo,
@@ -175,7 +172,11 @@ void DolphinContextMenu::addDirectoryItemContextMenu()
     // set up 'Create New' menu
     DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);
     newFileMenu->checkUpToDate();
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 97, 0)
+    newFileMenu->setWorkingDirectory(m_fileInfo.url());
+#else
     newFileMenu->setPopupFiles(QList<QUrl>() << m_fileInfo.url());
+#endif
     newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
     connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
     connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
@@ -280,7 +281,11 @@ void DolphinContextMenu::addViewportContextMenu()
     // Set up and insert 'Create New' menu
     KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
     newFileMenu->checkUpToDate();
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 97, 0)
+    newFileMenu->setWorkingDirectory(m_baseUrl);
+#else
     newFileMenu->setPopupFiles(QList<QUrl>() << m_baseUrl);
+#endif
     addMenu(newFileMenu->menu());
 
     // Show "open with" menu items even if the dir is empty, because there are legitimate
@@ -445,8 +450,8 @@ void DolphinContextMenu::addAdditionalActions(const KFileItemListProperties &pro
     addSeparator();
 
     QList<QAction *> additionalActions;
-    if (props.isDirectory() && props.isLocal() && ContextMenuSettings::showOpenTerminal()) {
-        additionalActions << m_mainWindow->actionCollection()->action(QStringLiteral("open_terminal"));
+    if (props.isLocal() && ContextMenuSettings::showOpenTerminal()) {
+        additionalActions << m_mainWindow->actionCollection()->action(QStringLiteral("open_terminal_here"));
     }
     m_fileItemActions->addActionsTo(this, KFileItemActions::MenuActionSource::All, additionalActions);