--- a/eric6/ViewManager/ViewManager.py Wed May 08 18:44:00 2019 +0200 +++ b/eric6/ViewManager/ViewManager.py Sat May 11 11:19:32 2019 +0200 @@ -2770,27 +2770,6 @@ autocompletionMenu.addAction(self.autoCompleteFromAPIsAct) autocompletionMenu.addAction(self.autoCompleteFromAllAct) - searchMenu = QMenu( - QCoreApplication.translate('ViewManager', '&Search'), - self.ui) - searchMenu.setTearOffEnabled(True) - searchMenu.addAction(self.quickSearchAct) - searchMenu.addAction(self.quickSearchBackAct) - searchMenu.addAction(self.searchAct) - searchMenu.addAction(self.searchNextAct) - searchMenu.addAction(self.searchPrevAct) - searchMenu.addAction(self.searchNextWordAct) - searchMenu.addAction(self.searchPrevWordAct) - searchMenu.addAction(self.replaceAct) - searchMenu.addSeparator() - searchMenu.addAction(self.searchClearMarkersAct) - searchMenu.addSeparator() - searchMenu.addAction(self.searchFilesAct) - searchMenu.addAction(self.replaceFilesAct) - searchMenu.addSeparator() - searchMenu.addAction(self.searchOpenFilesAct) - searchMenu.addAction(self.replaceOpenFilesAct) - menu = QMenu(QCoreApplication.translate('ViewManager', '&Edit'), self.ui) menu.setTearOffEnabled(True) @@ -2821,8 +2800,6 @@ menu.addAction(self.calltipsAct) menu.addAction(self.codeInfoAct) menu.addSeparator() - menu.addMenu(searchMenu) - menu.addSeparator() menu.addAction(self.gotoAct) menu.addAction(self.gotoBraceAct) menu.addAction(self.gotoLastEditAct) @@ -3351,6 +3328,36 @@ )) self.replaceOpenFilesAct.triggered.connect(self.__replaceOpenFiles) self.searchActions.append(self.replaceOpenFilesAct) + + def initSearchMenu(self): + """ + Public method to create the Search menu. + + @return the generated menu + @rtype QMenu + """ + menu = QMenu( + QCoreApplication.translate('ViewManager', '&Search'), + self.ui) + menu.setTearOffEnabled(True) + menu.addAction(self.quickSearchAct) + menu.addAction(self.quickSearchBackAct) + menu.addAction(self.searchAct) + menu.addAction(self.searchNextAct) + menu.addAction(self.searchPrevAct) + menu.addAction(self.searchNextWordAct) + menu.addAction(self.searchPrevWordAct) + menu.addAction(self.replaceAct) + menu.addSeparator() + menu.addAction(self.searchClearMarkersAct) + menu.addSeparator() + menu.addAction(self.searchFilesAct) + menu.addAction(self.replaceFilesAct) + menu.addSeparator() + menu.addAction(self.searchOpenFilesAct) + menu.addAction(self.replaceOpenFilesAct) + + return menu def initSearchToolbars(self, toolbarManager): """ @@ -4375,7 +4382,7 @@ def addToExtrasMenu(self, menu): """ - Public method to add some actions to the extras menu. + Public method to add some actions to the Extras menu. @param menu reference to the menu to add actions to (QMenu) """