aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2022-03-03 10:37:03 +0100
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2022-03-09 15:26:01 +0000
commitc667450fe2a92a60e1d2debce8c90d0652f0913e (patch)
tree535769cd431cce95032162635e1a841ac54c0a98
parenta00597533f4e3d1e756c00800f698ad34b79beab (diff)
Doc: Show screenshots of Editor settings in more places
The screenshots are already in the repository, so show them where the options and settings are described. Task-number: QTCREATORBUG-26610 Change-Id: I6d1d89f6b7a13cd9afbb839ba9c8f6f55daa50c0 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--doc/qtcreator/src/editors/creator-code-syntax.qdoc2
-rw-r--r--doc/qtcreator/src/editors/creator-editors-options.qdoc18
2 files changed, 14 insertions, 6 deletions
diff --git a/doc/qtcreator/src/editors/creator-code-syntax.qdoc b/doc/qtcreator/src/editors/creator-code-syntax.qdoc
index f54337dd903..8da7ba560af 100644
--- a/doc/qtcreator/src/editors/creator-code-syntax.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-syntax.qdoc
@@ -97,6 +97,8 @@
between lines can be useful if there is usually not enough space to
display annotations next to the text.
+ \image qtcreator-options-text-editor-display.png "Text Editor Display options"
+
If you hide the annotations by deselecting the check box, you can move the
mouse pointer over an icon to view them.
diff --git a/doc/qtcreator/src/editors/creator-editors-options.qdoc b/doc/qtcreator/src/editors/creator-editors-options.qdoc
index d84ecc7f4da..a2e9d740b4a 100644
--- a/doc/qtcreator/src/editors/creator-editors-options.qdoc
+++ b/doc/qtcreator/src/editors/creator-editors-options.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -40,12 +40,18 @@
\title Configuring the Editor
- \QC allows you to configure the text editor to suit your specific
- needs. To configure the editor, select \uicontrol Tools >
- \uicontrol Options > \uicontrol{Text Editor}.
+ You can configure the text editor to suit your specific needs by selecting
+ \uicontrol Tools > \uicontrol Options > \uicontrol{Text Editor}.
+
+ \image qtcreator-font-colors.png "Text Editor options"
+
+ The settings you specify apply globally to all projects.
+
+ To specify editor behavior for an open project, select \uicontrol Projects >
+ \uicontrol Editor.
+
+ \image qtcreator-editor-settings.png "Editor settings"
- These settings apply to all projects. To specify editor behavior for an open
- project, select \uicontrol Projects > \uicontrol Editor.
\if defined(qtcreator)
For more information, see \l{Specifying Editor Settings}.
\endif