From 16f22b9e9545ee7d399efa5713f36d059a87f816 Mon Sep 17 00:00:00 2001 From: Jitse Niesen Date: Fri, 13 Mar 2020 16:46:15 +0000 Subject: [PATCH 1/2] Plugin: Use self._options_menu instead of self.options_menu The name was changed in spyder-ide/spyder#9226 --- spyder_notebook/notebookplugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spyder_notebook/notebookplugin.py b/spyder_notebook/notebookplugin.py index 11d6b774..d8bff762 100644 --- a/spyder_notebook/notebookplugin.py +++ b/spyder_notebook/notebookplugin.py @@ -80,10 +80,10 @@ def __init__(self, parent, testing=False): menu_btn = create_toolbutton(self, icon=ima.icon('tooloptions'), tip=_('Options')) - menu_btn.setMenu(self.options_menu) + menu_btn.setMenu(self._options_menu) menu_btn.setPopupMode(menu_btn.InstantPopup) corner_widgets = {Qt.TopRightCorner: [new_notebook_btn, menu_btn]} - self.tabwidget = Tabs(self, menu=self.options_menu, + self.tabwidget = Tabs(self, menu=self._options_menu, actions=self.menu_actions, corner_widgets=corner_widgets) From 6499fd8e2a06129df7cd31c766df4da551747b8e Mon Sep 17 00:00:00 2001 From: Jitse Niesen Date: Fri, 13 Mar 2020 19:51:10 +0000 Subject: [PATCH 2/2] Plugih: Remove remaining references to options_menu --- spyder_notebook/notebookplugin.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/spyder_notebook/notebookplugin.py b/spyder_notebook/notebookplugin.py index d8bff762..68c4acaf 100644 --- a/spyder_notebook/notebookplugin.py +++ b/spyder_notebook/notebookplugin.py @@ -69,7 +69,6 @@ def __init__(self, parent, testing=False): self.untitled_num = 0 self.recent_notebooks = self.get_option('recent_notebooks', default=[]) self.recent_notebook_menu = QMenu(_("Open recent"), self) - self.options_menu = QMenu(self) layout = QVBoxLayout() @@ -239,13 +238,9 @@ def update_notebook_actions(self): if client.get_filename() != WELCOME: self.save_as_action.setEnabled(True) self.open_console_action.setEnabled(True) - self.options_menu.clear() - add_actions(self.options_menu, self.menu_actions) return self.save_as_action.setEnabled(False) self.open_console_action.setEnabled(False) - self.options_menu.clear() - add_actions(self.options_menu, self.menu_actions) def add_to_recent(self, notebook): """