Merge pull request #1318 from ivanov/qt-console-ctrl-d

make Ctrl-D in qtconsole act same as in terminal

* ^D on empty prompt brings up exit dialog 
* ^D^D exits the qtconsole
* ^D otherwise does regular forward-delete

IPython/core/usage.py

@@ -407,13 +407,14 b' The keybindings themselves are:'
 - ``C-l``: clear terminal.
 - ``C-a``: go to beginning of line.
 - ``C-e``: go to end of line.
+- ``C-u``: kill from cursor to the begining of the line.
 - ``C-k``: kill from cursor to the end of the line.
 - ``C-y``: yank (paste)
 - ``C-p``: previous line (like up arrow)
 - ``C-n``: next line (like down arrow)
 - ``C-f``: forward (like right arrow)
 - ``C-b``: back (like left arrow)
-- ``C-d``: delete next character.
+- ``C-d``: delete next character, or exits if input is empty
 - ``M-<``: move to the beginning of the input region.
 - ``M->``: move to the end of the input region.
 - ``M-d``: delete next word.

IPython/frontend/qt/console/console_widget.py

@@ -144,8 +144,7 b' class ConsoleWidget(LoggingConfigurable, QtGui.QWidget):'
                          QtCore.Qt.Key_A : QtCore.Qt.Key_Home,
                          QtCore.Qt.Key_P : QtCore.Qt.Key_Up,
                          QtCore.Qt.Key_N : QtCore.Qt.Key_Down,
-                         QtCore.Qt.Key_H : QtCore.Qt.Key_Backspace,
-                         QtCore.Qt.Key_D : QtCore.Qt.Key_Delete, }
+                         QtCore.Qt.Key_H : QtCore.Qt.Key_Backspace, }
     if not sys.platform == 'darwin':
         # On OS X, Ctrl-E already does the right thing, whereas End moves the
         # cursor to the bottom of the buffer.
@@ -1116,6 +1115,16 b' class ConsoleWidget(LoggingConfigurable, QtGui.QWidget):'
                 self._kill_ring.kill_cursor(cursor)
                 intercepted = True
 
+            elif key == QtCore.Qt.Key_D:
+                if len(self.input_buffer) == 0:
+                    self.exit_requested.emit(self)
+                else:
+                    new_event = QtGui.QKeyEvent(QtCore.QEvent.KeyPress,
+                                                QtCore.Qt.Key_Delete,
+                                                QtCore.Qt.NoModifier)
+                    QtGui.qApp.sendEvent(self._control, new_event)
+                    intercepted = True
+
         #------ Alt modifier ---------------------------------------------------
 
         elif alt_down:

IPython/frontend/qt/console/mainwindow.py

@@ -188,6 +188,8 b' class MainWindow(QtGui.QMainWindow):'
                     justthis.setShortcut('N')
                     closeall = QtGui.QPushButton("&Yes, close all", self)
                     closeall.setShortcut('Y')
+                    # allow ctrl-d ctrl-d exit, like in terminal
+                    closeall.setShortcut('Ctrl+D')
                     box = QtGui.QMessageBox(QtGui.QMessageBox.Question,
                                             title, msg)
                     box.setInformativeText(info)