]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Fix missing entries in context menu for links
authorNathaniel Graham <nate@kde.org>
Wed, 21 Mar 2018 23:00:17 +0000 (17:00 -0600)
committerNathaniel Graham <nate@kde.org>
Thu, 22 Mar 2018 12:52:11 +0000 (06:52 -0600)
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

src/dolphincontextmenu.cpp

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