Merge 2e312118e88840e586d33656efc45a6de3961a5c into 08dd318614d21eb557a1311775b1a1dff509d3b4

python/PyQt6/gui/auto_additions/qgscodeeditor.py

@@ -66,7 +66,7 @@ try:
     QgsCodeEditor.getMonospaceFont = staticmethod(QgsCodeEditor.getMonospaceFont)
     QgsCodeEditor.isFixedPitch = staticmethod(QgsCodeEditor.isFixedPitch)
     QgsCodeEditor.__virtual_methods__ = ['language', 'languageCapabilities', 'moveCursorToStart', 'moveCursorToEnd', 'checkSyntax', 'toggleComment', 'initializeLexer', 'populateContextMenu', 'reformatCodeString', 'showMessage']
-    QgsCodeEditor.__overridden_methods__ = ['callTip', 'setText', 'focusOutEvent', 'keyPressEvent', 'contextMenuEvent', 'eventFilter']
+    QgsCodeEditor.__overridden_methods__ = ['callTip', 'setText', 'focusOutEvent', 'keyPressEvent', 'contextMenuEvent', 'event', 'eventFilter']
     QgsCodeEditor.__signal_arguments__ = {'helpRequested': ['word: str']}
     QgsCodeEditor.__group__ = ['codeeditors']
 except (NameError, AttributeError):

python/PyQt6/gui/auto_generated/codeeditors/qgscodeeditor.sip.in

@@ -601,6 +601,8 @@ Returns ``True`` if a ``font`` is a fixed pitch font.
 
     virtual void contextMenuEvent( QContextMenuEvent *event );
 
+    virtual bool event( QEvent *event );
+
     virtual bool eventFilter( QObject *watched, QEvent *event );
 
     virtual void initializeLexer();

python/gui/auto_additions/qgscodeeditor.py

@@ -65,7 +65,7 @@ try:
     QgsCodeEditor.getMonospaceFont = staticmethod(QgsCodeEditor.getMonospaceFont)
     QgsCodeEditor.isFixedPitch = staticmethod(QgsCodeEditor.isFixedPitch)
     QgsCodeEditor.__virtual_methods__ = ['language', 'languageCapabilities', 'moveCursorToStart', 'moveCursorToEnd', 'checkSyntax', 'toggleComment', 'initializeLexer', 'populateContextMenu', 'reformatCodeString', 'showMessage']
-    QgsCodeEditor.__overridden_methods__ = ['callTip', 'setText', 'focusOutEvent', 'keyPressEvent', 'contextMenuEvent', 'eventFilter']
+    QgsCodeEditor.__overridden_methods__ = ['callTip', 'setText', 'focusOutEvent', 'keyPressEvent', 'contextMenuEvent', 'event', 'eventFilter']
     QgsCodeEditor.__signal_arguments__ = {'helpRequested': ['word: str']}
     QgsCodeEditor.__group__ = ['codeeditors']
 except (NameError, AttributeError):

python/gui/auto_generated/codeeditors/qgscodeeditor.sip.in

@@ -601,6 +601,8 @@ Returns ``True`` if a ``font`` is a fixed pitch font.
 
     virtual void contextMenuEvent( QContextMenuEvent *event );
 
+    virtual bool event( QEvent *event );
+
     virtual bool eventFilter( QObject *watched, QEvent *event );
 
     virtual void initializeLexer();

src/gui/codeeditors/qgscodeeditor.cpp

@@ -359,6 +359,23 @@ void QgsCodeEditor::contextMenuEvent( QContextMenuEvent *event )
   }
 }
 
+bool QgsCodeEditor::event( QEvent *event )
+{
+  if ( event->type() == QEvent::ShortcutOverride )
+  {
+    if ( QKeyEvent *keyEvent = dynamic_cast<QKeyEvent *>( event ) )
+    {
+      if ( keyEvent->key() == Qt::Key_F1 )
+      {
+        // If the user pressed F1, we want to prevent the main help dialog to show
+        // and handle the event in QgsCodeEditor::keyPressEvent
+        keyEvent->accept();
+        return true;
+      }
+    }
+  }
+  return QsciScintilla::event( event );
+}
 
 bool QgsCodeEditor::eventFilter( QObject *watched, QEvent *event )
 {

src/gui/codeeditors/qgscodeeditor.h

@@ -611,6 +611,7 @@ class GUI_EXPORT QgsCodeEditor : public QsciScintilla
     void focusOutEvent( QFocusEvent *event ) override;
     void keyPressEvent( QKeyEvent *event ) override;
     void contextMenuEvent( QContextMenuEvent *event ) override;
+    bool event( QEvent *event ) override;
     bool eventFilter( QObject *watched, QEvent *event ) override;
     /**
      * Called when the dialect specific code lexer needs to be initialized (or reinitialized).