diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index c8ef2a4f1ab..5454472cfc7 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -2928,6 +2928,16 @@ void EditorManager::addNativeDirAndOpenWithActions(QMenu *contextMenu, DocumentM populateOpenWithMenu(openWith, entry->filePath()); } +void EditorManager::addContextMenuActions( + QMenu *contextMenu, DocumentModel::Entry *entry, IEditor *editor) +{ + EditorManager::addSaveAndCloseEditorActions(contextMenu, entry, editor); + contextMenu->addSeparator(); + EditorManager::addPinEditorActions(contextMenu, entry); + contextMenu->addSeparator(); + EditorManager::addNativeDirAndOpenWithActions(contextMenu, entry); +} + /*! Populates the \uicontrol {Open With} menu \a menu with editors that are suitable for opening the document \a filePath. diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h index aea9e2eebf1..7d323ba0531 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.h +++ b/src/plugins/coreplugin/editormanager/editormanager.h @@ -141,6 +141,8 @@ public: IEditor *editor = nullptr); static void addPinEditorActions(QMenu *contextMenu, DocumentModel::Entry *entry); static void addNativeDirAndOpenWithActions(QMenu *contextMenu, DocumentModel::Entry *entry); + static void addContextMenuActions( + QMenu *contextMenu, DocumentModel::Entry *entry, IEditor *editor = nullptr); static void populateOpenWithMenu(QMenu *menu, const Utils::FilePath &filePath); static void runWithTemporaryEditor(const Utils::FilePath &filePath, diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp index 0a9d165e629..9afd9899d3f 100644 --- a/src/plugins/coreplugin/editormanager/editorview.cpp +++ b/src/plugins/coreplugin/editormanager/editorview.cpp @@ -381,11 +381,7 @@ void EditorView::fillListContextMenu(QMenu *menu) const IEditor *editor = currentEditor(); DocumentModel::Entry *entry = editor ? DocumentModel::entryForDocument(editor->document()) : nullptr; - EditorManager::addSaveAndCloseEditorActions(menu, entry, editor); - menu->addSeparator(); - EditorManager::addPinEditorActions(menu, entry); - menu->addSeparator(); - EditorManager::addNativeDirAndOpenWithActions(menu, entry); + EditorManager::addContextMenuActions(menu, entry, editor); } void EditorView::splitHorizontally() diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp index cc7451b9395..e72aff96bbd 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp @@ -153,11 +153,7 @@ void OpenEditorsWidget::contextMenuRequested(QPoint pos) QModelIndex editorIndex = indexAt(pos); const int row = m_model->mapToSource(editorIndex).row(); DocumentModel::Entry *entry = DocumentModel::entryAtRow(row); - EditorManager::addSaveAndCloseEditorActions(&contextMenu, entry); - contextMenu.addSeparator(); - EditorManager::addPinEditorActions(&contextMenu, entry); - contextMenu.addSeparator(); - EditorManager::addNativeDirAndOpenWithActions(&contextMenu, entry); + EditorManager::addContextMenuActions(&contextMenu, entry); contextMenu.exec(mapToGlobal(pos)); } diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp index 857a32b6372..a410f0335c9 100644 --- a/src/plugins/coreplugin/editortoolbar.cpp +++ b/src/plugins/coreplugin/editortoolbar.cpp @@ -341,11 +341,7 @@ void EditorToolBar::fillListContextMenu(QMenu *menu) IEditor *editor = EditorManager::currentEditor(); DocumentModel::Entry *entry = editor ? DocumentModel::entryForDocument(editor->document()) : nullptr; - EditorManager::addSaveAndCloseEditorActions(menu, entry, editor); - menu->addSeparator(); - EditorManager::addPinEditorActions(menu, entry); - menu->addSeparator(); - EditorManager::addNativeDirAndOpenWithActions(menu, entry); + EditorManager::addContextMenuActions(menu, entry, editor); } }