From 0433ea7769199bcf1fa3a38a8bf384e5e13c2c7e Mon Sep 17 00:00:00 2001 From: Bussonnier Matthias Date: Sun, 27 Nov 2011 16:02:06 +0100 Subject: [PATCH] Warning in code. qtconsole ssh -X Put warning in code not to remove an action needed when ssh -X. "All magics..." menu should be autopopulated at startup, but is not when X forwarding, Warn in code that inserting 'update all magic menu' action in this same menu is not as useless as it may seem --- IPython/frontend/qt/console/mainwindow.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/IPython/frontend/qt/console/mainwindow.py b/IPython/frontend/qt/console/mainwindow.py index eaa5fe1b07f..7257d543e8c 100644 --- a/IPython/frontend/qt/console/mainwindow.py +++ b/IPython/frontend/qt/console/mainwindow.py @@ -622,8 +622,10 @@ def init_magic_menu(self): self.magic_menu = self.menuBar().addMenu("&Magic") self.all_magic_menu = self.magic_menu.addMenu("&All Magics") - # this action should not appear as it will be cleard when menu - # will be updated at first kernel response. + # This action should usually not appear as it will be cleared when menu + # is updated at first kernel response. Though, it is necessary when + # connecting through X-forwarding, as in this case, the menu is not + # auto updated, SO DO NOT DELETE. self.pop = QtGui.QAction("&Update All Magic Menu ", self, triggered=self.update_all_magic_menu) self.add_menu_action(self.all_magic_menu, self.pop)