Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

move some action in main windows as asked by @epatters.

	not all haves benn moves as i'm not sure yet how to handle some of them
  • Loading branch information...
commit 5932a85e7517a64cc36b02a257eb5245de493b30 1 parent 2230aba
@Carreau Carreau authored fperez committed
View
50 IPython/frontend/qt/console/console_widget.py
@@ -274,56 +274,6 @@ def __init__(self, parent=None, **kw):
triggered=self.reset_font)
self.addAction(self.reset_font_size)
- self.undo_action = QtGui.QAction("Undo",
- self,
- shortcut="Ctrl+Z",
- statusTip="Undo last action if possible",
- triggered=self._control.undo)
- self.undo_action.setDisabled(True)
- self.addAction(self.undo_action)
-
- self.redo_action = QtGui.QAction("Redo",
- self,
- shortcut="Ctrl+Shift+Z",
- statusTip="Redo last action if possible",
- triggered=self._control.redo)
- self.redo_action.setDisabled(True)
- self.addAction(self.redo_action)
-
- self.reset_action = QtGui.QAction("Reset",
- self,
- statusTip="Clear all varible from workspace",
- triggered=self.reset_magic)
- self.reset_action.setDisabled(True)
- self.addAction(self.reset_action)
-
- self.clear_action = QtGui.QAction("Clear",
- self,
- statusTip="Clear the console",
- triggered=self.clear_magic)
- self.clear_action.setDisabled(True)
- self.addAction(self.clear_action)
-
- self.who_action = QtGui.QAction("Who",
- self,
- statusTip="List interactive variable",
- triggered=self.who_magic)
- self.who_action.setDisabled(True)
- self.addAction(self.who_action)
-
- self.whos_action = QtGui.QAction("Whos",
- self,
- statusTip="List interactive variable with detail",
- triggered=self.whos_magic)
- self.whos_action.setDisabled(True)
- self.addAction(self.whos_action)
-
- self.who_ls_action = QtGui.QAction("Who ls",
- self,
- statusTip="Return a list of interactive variable",
- triggered=self.who_ls_magic)
- self.who_ls_action.setDisabled(True)
- self.addAction(self.who_ls_action)
def eventFilter(self, obj, event):
View
65 IPython/frontend/qt/console/qtconsoleapp.py
@@ -139,14 +139,23 @@ def initMenuBar(self):
print "trying to add unexisting action, skipping"
try:
- self.editMenu.addAction(self._frontend.undo_action)
- self._frontend.undo_action.setEnabled(True)
+ self.undo_action = QtGui.QAction("Undo",
+ self,
+ shortcut="Ctrl+Z",
+ statusTip="Undo last action if possible",
+ triggered=self._frontend.undo)
+
+ self.editMenu.addAction(self.undo_action)
except AttributeError:
print "trying to add unexisting action, skipping"
try:
- self.editMenu.addAction(self._frontend.redo_action)
- self._frontend.redo_action.setEnabled(True)
+ self.redo_action = QtGui.QAction("Redo",
+ self,
+ shortcut="Ctrl+Shift+Z",
+ statusTip="Redo last action if possible",
+ triggered=self._frontend.redo)
+ self.editMenu.addAction(self.redo_action)
except AttributeError:
print "trying to add unexisting action, skipping"
@@ -166,46 +175,62 @@ def initMenuBar(self):
print "trying to add unexisting action, skipping"
try:
- self.magicMenu.addAction(self._frontend.reset_action)
- self._frontend.reset_action.setEnabled(True)
+ self.reset_action = QtGui.QAction("Reset",
+ self,
+ statusTip="Clear all varible from workspace",
+ triggered=self._frontend.reset_magic)
+ self.magicMenu.addAction(self.reset_action)
except AttributeError:
- print "trying to add unexisting action, skipping"
+ print "trying to add unexisting action (reset), skipping"
try:
self.magicMenu.addAction(self._frontend.history_action)
self._frontend.history_action.setEnabled(True)
except AttributeError:
- print "trying to add unexisting action, skipping"
+ print "trying to add unexisting action (history), skipping"
try:
self.magicMenu.addAction(self._frontend.save_action)
self._frontend.save_action.setEnabled(True)
except AttributeError:
- print "trying to add unexisting action, skipping"
+ print "trying to add unexisting action (save), skipping"
+ self._frontend.reset_action.setEnabled(True)
try:
- self.magicMenu.addAction(self._frontend.clear_action)
- self._frontend.clear_action.setEnabled(True)
+ self.clear_action = QtGui.QAction("Clear",
+ self,
+ statusTip="Clear the console",
+ triggered=self._frontend.clear_magic)
+ self.magicMenu.addAction(self.clear_action)
except AttributeError:
print "trying to add unexisting action, skipping"
try:
- self.magicMenu.addAction(self._frontend.who_action)
- self._frontend.who_action.setEnabled(True)
+ self.who_action = QtGui.QAction("Who",
+ self,
+ statusTip="List interactive variable",
+ triggered=self._frontend.who_magic)
+ self.magicMenu.addAction(self.who_action)
except AttributeError:
- print "trying to add unexisting action, skipping"
+ print "trying to add unexisting action (who), skipping"
try:
- self.magicMenu.addAction(self._frontend.who_ls_action)
- self._frontend.who_ls_action.setEnabled(True)
+ self.who_ls_action = QtGui.QAction("Who ls",
+ self,
+ statusTip="Return a list of interactive variable",
+ triggered=self._frontend.who_ls_magic)
+ self.magicMenu.addAction(self.who_ls_action)
except AttributeError:
- print "trying to add unexisting action, skipping"
+ print "trying to add unexisting action (who_ls), skipping"
try:
- self.magicMenu.addAction(self._frontend.whos_action)
- self._frontend.whos_action.setEnabled(True)
+ self.whos_action = QtGui.QAction("Whos",
+ self,
+ statusTip="List interactive variable with detail",
+ triggered=self._frontend.whos_magic)
+ self.magicMenu.addAction(self.whos_action)
except AttributeError:
- print "trying to add unexisting action, skipping"
+ print "trying to add unexisting action (whos), skipping"
#---------------------------------------------------------------------------
Please sign in to comment.
Something went wrong with that request. Please try again.