diff options
| author | David Faure <[email protected]> | 2014-08-22 10:16:48 +0200 |
|---|---|---|
| committer | David Faure <[email protected]> | 2014-08-22 10:16:48 +0200 |
| commit | ee946d362c64ee35af932b3cad54d23ad786fe55 (patch) | |
| tree | 167edee2c9f91fc6f572a006c9b28551809ec809 /src/panels/folders/treeviewcontextmenu.cpp | |
| parent | e44ddfa5ab16af7cdcfc1c835e1baa8b32beaa67 (diff) | |
Port away from KonqOperations::askDeleteConfirmation and KonqOperations::del
and remove them. Porting docs added to https://community.kde.org/Frameworks/Porting_Notes#libkonq
Diffstat (limited to 'src/panels/folders/treeviewcontextmenu.cpp')
| -rw-r--r-- | src/panels/folders/treeviewcontextmenu.cpp | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp index 932d102b8..9450d3e17 100644 --- a/src/panels/folders/treeviewcontextmenu.cpp +++ b/src/panels/folders/treeviewcontextmenu.cpp @@ -22,9 +22,12 @@ #include <KFileItem> #include <KIconLoader> +#include <KIO/CopyJob> #include <KIO/DeleteJob> +#include <KIO/JobUiDelegate> #include <KMenu> #include <KIcon> +#include <KJobWidgets> #include <KSharedConfig> #include <KConfigGroup> #include <kurlmimedata.h> @@ -32,6 +35,7 @@ #include <konq_operations.h> #include <KLocale> #include <KIO/Paste> +#include <KIO/FileUndoManager> #include <KPropertiesDialog> #include "folderspanel.h" @@ -187,12 +191,27 @@ void TreeViewContextMenu::rename() void TreeViewContextMenu::moveToTrash() { - KonqOperations::del(m_parent, KonqOperations::TRASH, KUrl::List() << m_fileItem.url()); + KUrl::List list = KUrl::List() << m_fileItem.url(); + KIO::JobUiDelegate uiDelegate; + uiDelegate.setWindow(m_parent); + if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) { + KIO::Job* job = KIO::trash(list); + KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, KUrl("trash:/"), job); + KJobWidgets::setWindow(job, m_parent); + job->ui()->setAutoErrorHandlingEnabled(true); + } } void TreeViewContextMenu::deleteItem() { - KonqOperations::del(m_parent, KonqOperations::DEL, KUrl::List() << m_fileItem.url()); + KUrl::List list = KUrl::List() << m_fileItem.url(); + KIO::JobUiDelegate uiDelegate; + uiDelegate.setWindow(m_parent); + if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Delete, KIO::JobUiDelegate::DefaultConfirmation)) { + KIO::Job* job = KIO::del(list); + KJobWidgets::setWindow(job, m_parent); + job->ui()->setAutoErrorHandlingEnabled(true); + } } void TreeViewContextMenu::showProperties() |