X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f81d73a7f3a851dc755ef0cd1fd2a2507587a900..d57990e681397d3dc2d2ebf737eced730dd3ecf7:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 354111a01..e1c67aad1 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -122,7 +122,7 @@ void DolphinContextMenu::addTrashContextMenu() { Q_ASSERT(m_context & TrashContext); - QAction *emptyTrashAction = addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@action:inmenu", "Empty Trash"), [this]() { + QAction *emptyTrashAction = addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@action:inmenu", "Empty Trash"), this, [this]() { Trash::empty(m_mainWindow); }); emptyTrashAction->setEnabled(!Trash::isEmpty()); @@ -154,6 +154,7 @@ void DolphinContextMenu::addTrashItemContextMenu() "Restore to Former Location", "Restore to Former Locations", m_selectedItems.count()), + this, [this]() { QList selectedUrls; selectedUrls.reserve(m_selectedItems.count()); @@ -166,9 +167,6 @@ void DolphinContextMenu::addTrashItemContextMenu() job->uiDelegate()->setAutoErrorHandlingEnabled(true); }); - QAction *propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties")); - addAction(propertiesAction); - addSeparator(); addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Cut))); @@ -178,6 +176,10 @@ void DolphinContextMenu::addTrashItemContextMenu() QAction *deleteAction = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile)); addAction(deleteAction); + + addSeparator(); + + addAction(m_mainWindow->actionCollection()->action(QStringLiteral("properties"))); } void DolphinContextMenu::addDirectoryItemContextMenu() @@ -201,7 +203,7 @@ void DolphinContextMenu::addDirectoryItemContextMenu() // set up 'Create New' menu QAction *newDirAction = m_mainWindow->actionCollection()->action(QStringLiteral("create_dir")); QAction *newFileAction = m_mainWindow->actionCollection()->action(QStringLiteral("create_file")); - DolphinNewFileMenu *newFileMenu = new DolphinNewFileMenu(newDirAction, newFileAction, m_mainWindow); + DolphinNewFileMenu *newFileMenu = new DolphinNewFileMenu(newDirAction, newFileAction, this); newFileMenu->checkUpToDate(); newFileMenu->setWorkingDirectory(m_fileInfo.url()); newFileMenu->setEnabled(selectedItemsProps.supportsWriting());