X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/27dca0285e8b14227163cd2d342b1055fc165845..09a0a44a073cf6396f0a28dc3847d081c4dab24e:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index e2f7e326b..8372060aa 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -32,6 +32,7 @@ #include #include #include +#include DolphinContextMenu::DolphinContextMenu(DolphinMainWindow *parent, const KFileItem &fileInfo, @@ -165,9 +166,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))); @@ -177,6 +175,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() @@ -198,7 +200,9 @@ void DolphinContextMenu::addDirectoryItemContextMenu() addOpenWithActions(); // set up 'Create New' menu - DolphinNewFileMenu *newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection()->action(QStringLiteral("create_dir")), m_mainWindow); + 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); newFileMenu->checkUpToDate(); newFileMenu->setWorkingDirectory(m_fileInfo.url()); newFileMenu->setEnabled(selectedItemsProps.supportsWriting());