Fix missing entries in context menu for links

Summary: https://cgit.kde.org/dolphin.git/commit/?id=86f4fcb8cd574f6d886627fc5e01c9edfc84e977 introduced a regression: the context menu for links no longer shows various items that were gated behind being a directory. However, a link can be both a link and a directory, from KIO's perspective. This patch resolves the issue.

Test Plan:
- Context menus for files, folders, and file links are unchanged.
- The missing context menu items for folder links have returned: {F5761809}

I should have tested that patch better, and for that I apologize and offer to fix this regression here. I will endeavor to up my reviewing game.

Reviewers: rominf, michaelh, #dolphin, rkflx

Reviewed By: rominf, rkflx

Subscribers: rkflx

Differential Revision: https://phabricator.kde.org/D11562
This commit is contained in:
Nathaniel Graham 2018-03-21 17:00:17 -06:00
parent 1da0983c42
commit f728d72864

View file

@ -196,7 +196,8 @@ void DolphinContextMenu::openItemContextMenu()
if (m_fileInfo.isLink()) { if (m_fileInfo.isLink()) {
addAction(m_mainWindow->actionCollection()->action(QStringLiteral("show_target"))); addAction(m_mainWindow->actionCollection()->action(QStringLiteral("show_target")));
addSeparator(); addSeparator();
} else if (m_fileInfo.isDir()) { }
if (m_fileInfo.isDir()) {
// setup 'Create New' menu // setup 'Create New' menu
DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow); DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);
const DolphinView* view = m_mainWindow->activeViewContainer()->view(); const DolphinView* view = m_mainWindow->activeViewContainer()->view();