aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2019-04-09 12:43:40 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2019-04-09 12:50:33 +0000
commit9d61f64a6534c33aedd059783ddf78dbe1db87bc (patch)
tree6299aec1343e4a5618ab5722b84937e3947503c0
parent9cd1f4d6d0d9666c660845dd59e2daf1cd60727c (diff)
Doc: Update information about using the editor toolbar
- Add section headings - Describe the context menu for the open file - Add screen shot of the Text Encoding dialog Change-Id: Ic2196855321eee6a8f742cd6dc8f8e316b976cdf Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--doc/images/qtcreator-text-encoding.pngbin0 -> 12033 bytes
-rw-r--r--doc/src/editors/creator-coding-edit-mode.qdoc39
2 files changed, 27 insertions, 12 deletions
diff --git a/doc/images/qtcreator-text-encoding.png b/doc/images/qtcreator-text-encoding.png
new file mode 100644
index 0000000000..1c528e50ec
--- /dev/null
+++ b/doc/images/qtcreator-text-encoding.png
Binary files differ
diff --git a/doc/src/editors/creator-coding-edit-mode.qdoc b/doc/src/editors/creator-coding-edit-mode.qdoc
index eed6cef31f..51695520bc 100644
--- a/doc/src/editors/creator-coding-edit-mode.qdoc
+++ b/doc/src/editors/creator-coding-edit-mode.qdoc
@@ -52,6 +52,8 @@
\image studio-edit-mode.png
\endif
+ \section2 Navigating Between Open Files and Symbols
+
Use the toolbar to navigate between open files and symbols in use. To browse
backward or forward through your location history, click
\inlineimage prev.png
@@ -59,8 +61,12 @@
(\uicontrol {Go Forward}).
To go to any open file, select it from the \uicontrol {Open files} drop-down
- menu (1). Right-click the menu title and select \uicontrol {Copy Full Path}
- to copy the path and name of the current file to the clipboard.
+ menu (1). To open a context menu that contains commands for managing open
+ files, right-click the file name or icon on the toolbar. In addition to the
+ commands also available in the \uicontrol File menu, you can copy the path
+ and name of the current file and the number of the line where the cursor is
+ currently located to the clipboard by selecting \uicontrol {Copy Full Path},
+ \uicontrol {Copy File Name}, or \uicontrol {Copy Path and Line Number}.
To jump to any symbol used in the current file, select it from the
\uicontrol Symbols drop-down menu (2). By default, the symbols are displayed
@@ -70,10 +76,16 @@
To jump to a line and column in the current file, select the line and column
indicator (3) or press \key {Ctrl+K} (or \key {Cmd+K} on \macos) to open the
- locator. Enter the line number and column number in the locator, separated
- by a colon (:).
+ \l{Searching with the Locator}{locator}. Enter the line number and column
+ number in the locator, separated by a colon (:).
+
+ \note Other convenient ways of navigating in \QC are provided
+ by the \l{Keyboard Shortcuts} {keyboard shortcuts} and the
+ \l{Browsing Project Contents}{sidebar}.
\if defined(qtcreator)
+ \section2 Selecting Parse Context
+
Code might be interpreted differently in different contexts. A file can be
used by different projects or subprojects with different defines, or it can
be included in the context of C, C++, Objective-C, or Objective-C++. To
@@ -86,19 +98,22 @@
incorrect, select \uicontrol {Additional Preprocessor Directives} to
add preprocessor directives.
+ \section2 Changing Text Encoding
+
To show the file encoding of the current file on the editor toolbar (5),
select \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
- \uicontrol Display > \uicontrol {Display file encoding}. To change the
- encoding, click it on the toolbar and select new encoding in the
- \uicontrol {Text Encoding} dialog. To reload the file with the selected
- encoding, select \uicontrol {Reload with Encoding}. To save the file with
+ \uicontrol Display > \uicontrol {Display file encoding}.
+
+ To change the text encoding, click it on the toolbar and select new
+ encoding in the \uicontrol {Text Encoding} dialog:
+
+ \image qtcreator-text-encoding.png "Text Encoding dialog"
+
+ To reload the file with the selected encoding, select
+ \uicontrol {Reload with Encoding}. To save the file with
the new encoding, select \uicontrol {Save with Encoding}.
\endif
- \note Other convenient ways of navigating in \QC are provided by the
- \l{Searching with the Locator}{locator}, \l{Keyboard Shortcuts}
- {keyboard shortcuts}, and the \l{Browsing Project Contents}{sidebar}.
-
\section1 Splitting the Editor View
Split the editor view or open the editor in a new window when you want to