diff --git a/dist/changelog/changes-12.0.0.md b/dist/changelog/changes-12.0.0.md index 177ae477ff0..98c65bc68a3 100644 --- a/dist/changelog/changes-12.0.0.md +++ b/dist/changelog/changes-12.0.0.md @@ -299,6 +299,8 @@ Terminal * Added support for Windows Terminal schemes * Fixed `Ctrl+C/V` on Windows +([Documentation](https://doc-snapshots.qt.io/qtcreator-12.0/creator-reference-terminal-view.html)) + Version Control Systems ----------------------- diff --git a/doc/qtcreator/images/icons/shortcuts.png b/doc/qtcreator/images/icons/shortcuts.png new file mode 100644 index 00000000000..e059023486e Binary files /dev/null and b/doc/qtcreator/images/icons/shortcuts.png differ diff --git a/doc/qtcreator/images/qtcreator-output-terminal.webp b/doc/qtcreator/images/qtcreator-output-terminal.webp index ac3f444cef2..83668815694 100644 Binary files a/doc/qtcreator/images/qtcreator-output-terminal.webp and b/doc/qtcreator/images/qtcreator-output-terminal.webp differ diff --git a/doc/qtcreator/images/qtcreator-preferences-terminal.webp b/doc/qtcreator/images/qtcreator-preferences-terminal.webp index 5772f8ee94f..d3165d15874 100644 Binary files a/doc/qtcreator/images/qtcreator-preferences-terminal.webp and b/doc/qtcreator/images/qtcreator-preferences-terminal.webp differ diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc index 96cecd089dc..2be2fd8a2c3 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc @@ -52,6 +52,8 @@ \li To open terminal preferences, select \inlineimage icons/settings.png (\uicontrol Configure). + \li To keep \QC keyboard shortcuts from interfering in the terminal, + select \inlineimage icons/shortcuts.png. \endlist Most of the \QC keyboard shortcuts are disabled in the terminal, except the @@ -79,12 +81,18 @@ \row \li \uicontrol {Send escape key to terminal} \li Send the escape key to the terminal instead of closing the terminal. + \row + \li \uicontrol {Block shortcuts in terminal} + \li Keep \QC keyboard shortcuts from interfering in the terminal. \row \li \uicontrol {Audible bell} \li Play an audible bell when the a bell character is received. \row \li \uicontrol {Allow blinking cursor} \li Allow the cursor to blink. + \row + \li \uicontrol {Enable mouse tracking} + \li Enable mouse tracking in the terminal. \row \li \uicontrol {Font} \li Select the \uicontrol {Font family} and \uicontrol Size for the text @@ -96,6 +104,10 @@ \li Set colors for the \uicontrol Terminal pane \uicontrol Foreground, \uicontrol Background, \uicontrol Selection, and \uicontrol {Find match}. + + To use an existing color scheme, select \uicontrol {Load Theme}. + + To revert color changes, select \uicontrol {Reset Theme}. \row \li \uicontrol {Default shell} \li Set the full path to the default terminal executable in @@ -103,8 +115,5 @@ in \uicontrol {Shell arguments}. \endtable - To use an existing color scheme, select \uicontrol {Load Theme}. To revert - color changes, select \uicontrol {Reset Theme}. - - \sa {View output} + \sa {View output}, {Keyboard Shortcuts} */