diff --git a/doc/qtcreator-texteditor-completion.png b/doc/qtcreator-texteditor-completion.png new file mode 100644 index 0000000000000000000000000000000000000000..b9affb233926abae16aec7a7294695f80a4cffc3 Binary files /dev/null and b/doc/qtcreator-texteditor-completion.png differ diff --git a/doc/qtcreator-texteditor-fonts.png b/doc/qtcreator-texteditor-fonts.png new file mode 100644 index 0000000000000000000000000000000000000000..ae08dfe5560bcbde3f77974c4c574109ce1b8225 Binary files /dev/null and b/doc/qtcreator-texteditor-fonts.png differ diff --git a/doc/qtcreator-texteditor-general.png b/doc/qtcreator-texteditor-general.png new file mode 100644 index 0000000000000000000000000000000000000000..c701efbd2def407395a15223c5d716aae42ee75b Binary files /dev/null and b/doc/qtcreator-texteditor-general.png differ diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index adca523a81f0561ccf3b06e17d95462906be6f12..ac88edd4558b1617f0648c354936f9a7727d27ee 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -215,8 +215,20 @@ \title The Code Editor - ### SCREENSHOT of the editor in action + Qt Creator's code editor is designed to aid the developer to create, edit, + and navigate code. It is fully equipped with syntax highlighting, code + completion, context sensitive help, as well as inline error indicators + while you are typing. The screenshots below show the various dialogs within + which you can configure your editor. + \table + \row + \i \inlineimage qtcreator-texteditor-general.png + \i \inlineimage qtcreator-texteditor-fonts.png + \i \inlineimage qtcreator-texteditor-completion.png + \endtable + + The table below lists keyboard shortcuts supported by the code editor. \table \row @@ -239,10 +251,19 @@ \row \i Indenting Blocks \i Use \key{Ctrl+I} + + \row + \i Collapse + \i Use \key{Ctrl+\<} + \row \i Commenting or uncommenting blocks \i Use \key{Ctrl+\/} + \row + \i Delete a line + \i Use \key{Shift+Del} + \row \i Switch between header file and source file \i Use \key{F4}. @@ -256,19 +277,12 @@ \i Use \key{F2} and \key{Shift+F2}. This feature works with namespaces, classes, methods, variables, include statements, and macros. - \endtable - - - More: - - Collapse - - Up/Down/Page Up/Page Down - hold ctrl to prevent the cursor from moving - - - To switch to an external editor, select \gui{Open in external editor} from - the \gui{Edit -> Advanced} menu. + \row + \i Switch to an external editor + \i Select \gui{Open in external editor} from the + \gui{Edit -> Advanced} menu. + \endtable */