summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKavindra Palaraja <qtc-committer@nokia.com>2009-02-04 15:57:02 +0100
committerKavindra Palaraja <qtc-committer@nokia.com>2009-02-04 15:57:25 +0100
commite14018076da29af265c60de3679519c62fc6f031 (patch)
treed4d46610cc49a9e8acbcbdd0c79bfbda12c671f4
parenta003b62aeb07cbe832b70c994e788356d44dd567 (diff)
downloadqt-creator-e14018076da29af265c60de3679519c62fc6f031.tar.gz
Fixes: Doc - final bits for the code editor
-rw-r--r--doc/qtcreator-texteditor-completion.pngbin0 -> 38192 bytes
-rw-r--r--doc/qtcreator-texteditor-fonts.pngbin0 -> 52919 bytes
-rw-r--r--doc/qtcreator-texteditor-general.pngbin0 -> 69681 bytes
-rw-r--r--doc/qtcreator.qdoc40
4 files changed, 27 insertions, 13 deletions
diff --git a/doc/qtcreator-texteditor-completion.png b/doc/qtcreator-texteditor-completion.png
new file mode 100644
index 0000000000..b9affb2339
--- /dev/null
+++ b/doc/qtcreator-texteditor-completion.png
Binary files differ
diff --git a/doc/qtcreator-texteditor-fonts.png b/doc/qtcreator-texteditor-fonts.png
new file mode 100644
index 0000000000..ae08dfe556
--- /dev/null
+++ b/doc/qtcreator-texteditor-fonts.png
Binary files differ
diff --git a/doc/qtcreator-texteditor-general.png b/doc/qtcreator-texteditor-general.png
new file mode 100644
index 0000000000..c701efbd2d
--- /dev/null
+++ b/doc/qtcreator-texteditor-general.png
Binary files differ
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index adca523a81..ac88edd455 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,11 +251,20 @@
\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
*/