]> cloud.milkyroute.net Git - dolphin.git/commitdiff
contextmenu: Listen to new error signal from KFileItemActions
authorAlexander Lohnau <alexander.lohnau@gmx.de>
Sat, 17 Apr 2021 19:55:22 +0000 (21:55 +0200)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Sun, 4 Jul 2021 20:33:48 +0000 (20:33 +0000)
Task: https://phabricator.kde.org/T12164

src/dolphincontextmenu.cpp

index ef74ec7f835888150ea54aa5b404193ca1643a5a..01e1a4109ed2e3e32967bf985627170b1ebf9bf9 100644 (file)
@@ -33,6 +33,7 @@
 #include <KPluginMetaData>
 #include <KStandardAction>
 #include <KToolBar>
 #include <KPluginMetaData>
 #include <KStandardAction>
 #include <KToolBar>
+#include <kio_version.h>
 
 #include <QApplication>
 #include <QClipboard>
 
 #include <QApplication>
 #include <QClipboard>
@@ -222,6 +223,11 @@ void DolphinContextMenu::openItemContextMenu()
 
     KFileItemActions fileItemActions;
     fileItemActions.setParentWidget(m_mainWindow);
 
     KFileItemActions fileItemActions;
     fileItemActions.setParentWidget(m_mainWindow);
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 82, 0)
+    connect(&fileItemActions, &KFileItemActions::error, this, [this](const QString &errorMessage) {
+        m_mainWindow->activeViewContainer()->showMessage(errorMessage, DolphinViewContainer::Error);
+    });
+#endif
     fileItemActions.setItemListProperties(selectedItemsProps);
 
     if (m_selectedItems.count() == 1) {
     fileItemActions.setItemListProperties(selectedItemsProps);
 
     if (m_selectedItems.count() == 1) {
@@ -313,6 +319,11 @@ void DolphinContextMenu::openViewportContextMenu()
     const KFileItemListProperties baseUrlProperties(KFileItemList() << baseFileItem());
     KFileItemActions fileItemActions;
     fileItemActions.setParentWidget(m_mainWindow);
     const KFileItemListProperties baseUrlProperties(KFileItemList() << baseFileItem());
     KFileItemActions fileItemActions;
     fileItemActions.setParentWidget(m_mainWindow);
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 82, 0)
+    connect(&fileItemActions, &KFileItemActions::error, this, [this](const QString &errorMessage) {
+        m_mainWindow->activeViewContainer()->showMessage(errorMessage, DolphinViewContainer::Error);
+    });
+#endif
     fileItemActions.setItemListProperties(baseUrlProperties);
 
     // Set up and insert 'Create New' menu
     fileItemActions.setItemListProperties(baseUrlProperties);
 
     // Set up and insert 'Create New' menu