mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-02-05 12:51:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove Ghost Entries of the Open Folder With

Browse Source 
There were two bugs with the previous implementation
one is that it didn't took in consideration the
Profile -> Mouse -> Advanced -> Underline Files
With that enabled, right click on the name of the folder
would give you a Open Folder With entry, so we would
end with two actions.

The other bug also triggered when that setting is enabled:
we never marked the Open Folder With for removal, after
inserting the menu for the underlined file.
This commit is contained in:
Tomaz Canabrava
2021-12-29 12:16:52 +00:00
parent 372c14da6a
commit 38bb7aa285
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/session/SessionController.cpp
View File

@@ -1827,6 +1827,7 @@ void SessionController::showDisplayContextMenu(const QPoint &position)
copy->setShortcut(Konsole::ACCEL | Qt::SHIFT | Qt::Key_C);
#endif
// Adds a "Open Folder With" action
const QUrl currentUrl = url().isLocalFile() ? url() : QUrl::fromLocalFile(QDir::homePath());
KFileItem item(currentUrl);
@@ -1841,14 +1842,26 @@ void SessionController::showDisplayContextMenu(const QPoint &position)
for (auto* elm : old) {
neu.removeAll(elm);
}
// Finish Ading the "Open Folder With" action.
QList<QAction *> toRemove = std::move(neu);
QList<QAction *> toRemove;
// prepend content-specific actions such as "Open Link", "Copy Email Address" etc
QSharedPointer<HotSpot> hotSpot = view()->filterActions(position);
if (hotSpot != nullptr) {
popup->insertActions(popup->actions().value(0, nullptr), hotSpot->actions() << contentSeparator);
popup->addAction(contentSeparator);
toRemove = hotSpot->setupMenu(popup.data());
// Can happen if we click on a right click, on a folder.
// if this happens, we need to remove this action as we have
// already added the action before this if.
if (toRemove[0]->text() == i18n("&Open Folder With")) {
delete toRemove[0];
toRemove.removeFirst();
}
toRemove = toRemove + neu;
} else {
toRemove = neu;
}
// always update this submenu before showing the context menu,