PR: Changes for handling/customizing shortcuts via traitlet variables and a coverage upload fix

.github/workflows/linux-tests.yml

@@ -23,7 +23,6 @@ jobs:
       PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
       RUNNER_OS: 'ubuntu'
       COVERALLS_REPO_TOKEN: XWVhJf2AsO7iouBLuCsh0pPhwHy81Uz1v
-      COVERALLS_SERVICE_NAME: 'github-actions'
     strategy:
       fail-fast: false
       matrix:
@@ -81,4 +80,4 @@ jobs:
       - name: Upload coverage to coveralls
         if: matrix.PYTHON_VERSION == '3.8'
         shell: bash -el {0}
-        run: coveralls
+        run: coveralls --service=github-actions

qtconsole/console_widget.py

@@ -171,6 +171,28 @@ def _font_family_default(self):
     # priority (when it has focus) over, e.g., window-level menu shortcuts.
     override_shortcuts = Bool(False)
 
+    shortcut_print = Unicode('Ctrl+P').tag(config=True)
+    shortcut_select_all = Unicode('Ctrl+A').tag(config=True)
+    shortcut_cut = Unicode().tag(config=True)
+    def _shortcut_cut_default(self):
+        return QtGui.QKeySequence(QtGui.QKeySequence.Cut).toString()
+    shortcut_copy = Unicode().tag(config=True)
+    def _shortcut_copy_default(self):
+        return QtGui.QKeySequence(QtGui.QKeySequence.Copy).toString()
+    shortcut_paste = Unicode().tag(config=True)
+    def _shortcut_paste_default(self):
+        return QtGui.QKeySequence(QtGui.QKeySequence.Paste).toString()
+    shortcut_save = Unicode().tag(config=True)
+    def _shortcut_save_default(self):
+        return QtGui.QKeySequence(QtGui.QKeySequence.Save).toString()
+    shortcut_zoom_in = Unicode().tag(config=True)
+    def _shortcut_zoom_in_default(self):
+        return QtGui.QKeySequence(QtGui.QKeySequence.ZoomIn).toString()
+    shortcut_zoom_out = Unicode().tag(config=True)
+    def _shortcut_zoom_out_default(self):
+        return QtGui.QKeySequence(QtGui.QKeySequence.ZoomOut).toString()
+    shortcut_reset_font_size = Unicode('Ctrl+0').tag(config=True)
+
     # ------ Custom Qt Widgets -------------------------------------------------
 
     # For other projects to easily override the Qt widgets used by the console
@@ -322,56 +344,56 @@ def __init__(self, parent=None, **kw):
         # Configure actions.
         action = QtWidgets.QAction('Print', None)
         action.setEnabled(True)
-        printkey = QtGui.QKeySequence(QtGui.QKeySequence.Print)
+        printkey = QtGui.QKeySequence(self.shortcut_print)
         if printkey.matches("Ctrl+P") and sys.platform != 'darwin':
             # Only override the default if there is a collision.
             # Qt ctrl = cmd on OSX, so the match gets a false positive on OSX.
-            printkey = "Ctrl+Shift+P"
-        action.setShortcut(printkey)
+            self.shortcut_print = "Ctrl+Shift+P"
+        action.setShortcut(self.shortcut_print)
         action.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         action.triggered.connect(self.print_)
         self.addAction(action)
         self.print_action = action
 
         action = QtWidgets.QAction('Save as HTML/XML', None)
-        action.setShortcut(QtGui.QKeySequence.Save)
+        action.setShortcut(self.shortcut_save)
         action.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         action.triggered.connect(self.export_html)
         self.addAction(action)
         self.export_action = action
 
         action = QtWidgets.QAction('Select All', None)
         action.setEnabled(True)
-        selectall = QtGui.QKeySequence(QtGui.QKeySequence.SelectAll)
+        selectall = QtGui.QKeySequence(self.shortcut_select_all)
         if selectall.matches("Ctrl+A") and sys.platform != 'darwin':
             # Only override the default if there is a collision.
             # Qt ctrl = cmd on OSX, so the match gets a false positive on OSX.
-            selectall = "Ctrl+Shift+A"
-        action.setShortcut(selectall)
+            self.shortcut_select_all = "Ctrl+Shift+A"
+        action.setShortcut(self.shortcut_select_all)
         action.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         action.triggered.connect(self.select_all_smart)
         self.addAction(action)
         self.select_all_action = action
 
         self.increase_font_size = QtWidgets.QAction("Bigger Font",
                 self,
-                shortcut=QtGui.QKeySequence.ZoomIn,
+                shortcut=self.shortcut_zoom_in,
                 shortcutContext=QtCore.Qt.WidgetWithChildrenShortcut,
                 statusTip="Increase the font size by one point",
                 triggered=self._increase_font_size)
         self.addAction(self.increase_font_size)
 
         self.decrease_font_size = QtWidgets.QAction("Smaller Font",
                 self,
-                shortcut=QtGui.QKeySequence.ZoomOut,
+                shortcut=self.shortcut_zoom_out,
                 shortcutContext=QtCore.Qt.WidgetWithChildrenShortcut,
                 statusTip="Decrease the font size by one point",
                 triggered=self._decrease_font_size)
         self.addAction(self.decrease_font_size)
 
         self.reset_font_size = QtWidgets.QAction("Normal Font",
                 self,
-                shortcut="Ctrl+0",
+                shortcut=self.shortcut_reset_font_size,
                 shortcutContext=QtCore.Qt.WidgetWithChildrenShortcut,
                 statusTip="Restore the Normal font size",
                 triggered=self.reset_font)
@@ -1146,15 +1168,15 @@ def _context_menu_make(self, pos):
 
         self.cut_action = menu.addAction('Cut', self.cut)
         self.cut_action.setEnabled(self.can_cut())
-        self.cut_action.setShortcut(QtGui.QKeySequence.Cut)
+        self.cut_action.setShortcut(self.shortcut_cut)
 
         self.copy_action = menu.addAction('Copy', self.copy)
         self.copy_action.setEnabled(self.can_copy())
-        self.copy_action.setShortcut(QtGui.QKeySequence.Copy)
+        self.copy_action.setShortcut(self.shortcut_copy)
 
         self.paste_action = menu.addAction('Paste', self.paste)
         self.paste_action.setEnabled(self.can_paste())
-        self.paste_action.setShortcut(QtGui.QKeySequence.Paste)
+        self.paste_action.setShortcut(self.shortcut_paste)
 
         anchor = self._control.anchorAt(pos)
         if anchor:

qtconsole/frontend_widget.py

@@ -142,6 +142,8 @@ def _lexer_default(self):
         lexer_class = import_item(self.lexer_class)
         return lexer_class()
 
+    shortcut_copy_raw = Unicode('Ctrl+Shift+C').tag(config=True)
+
     # Emitted when a user visible 'execute_request' has been submitted to the
     # kernel from the FrontendWidget. Contains the code to be executed.
     executing = QtCore.Signal(object)
@@ -190,11 +192,12 @@ def __init__(self, local_kernel=_local_kernel, *args, **kw):
         # Configure actions.
         action = self._copy_raw_action
         action.setEnabled(False)
-        action.setShortcut(QtGui.QKeySequence("Ctrl+Shift+C"))
+        action.setShortcut(self.shortcut_copy_raw)
         action.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         action.triggered.connect(self.copy_raw)
         self.copy_available.connect(action.setEnabled)
         self.addAction(action)
+        self.copy_raw_action = action
 
         # Connect signal handlers.
         document = self._control.document()