diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-06-18 13:50:44 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-06-22 09:14:23 +0000 |
| commit | 3a9266232b595a7daa84743c51f517e2e3b6b609 (patch) | |
| tree | ff843a3f84dd70054ae02242ecb9ac3ad1c64945 | |
| parent | 5b40e5b98303b658bf7d24fdb78d06a960fb2a3d (diff) | |
| download | qt-creator-3a9266232b595a7daa84743c51f517e2e3b6b609.tar.gz | |
Doc: Reformat
No text changes
Change-Id: Iabfdbdd19b255172b8f59fc5ed4ba55f1168e7d6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| -rw-r--r-- | doc/src/editors/creator-diff-editor.qdoc | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/doc/src/editors/creator-diff-editor.qdoc b/doc/src/editors/creator-diff-editor.qdoc index a920a3a4a8..c6479e9fb5 100644 --- a/doc/src/editors/creator-diff-editor.qdoc +++ b/doc/src/editors/creator-diff-editor.qdoc @@ -45,8 +45,8 @@ \endlist - The differences are output in the \uicontrol Edit mode. Color coding is used to - mark changed lines. By default, light red indicates lines that contain + The differences are output in the \uicontrol Edit mode. Color coding is used + to mark changed lines. By default, light red indicates lines that contain removed text (painted a darker red) in the left pane and light green indicates lines that contain added text (painted a darker green) in the right pane. @@ -65,35 +65,36 @@ (\uicontrol {Switch to Side by Side Diff Editor}). To change the default colors, select \uicontrol Tools > \uicontrol Options > - \uicontrol {Text Editor} > \uicontrol {Font & Colors}. Create your own color scheme and - select new colors for the following options: + \uicontrol {Text Editor} > \uicontrol {Font & Colors}. Create your own color + scheme and select new colors for the following options: \list - \li \uicontrol {Diff File Line} sets the color of the line that shows the - path and filename of the changed file. + \li \uicontrol {Diff File Line} sets the color of the line that shows + the path and filename of the changed file. - \li \uicontrol {Diff Context Line} sets the color of the line that shows - the number of hidden lines between changed lines. + \li \uicontrol {Diff Context Line} sets the color of the line that + shows the number of hidden lines between changed lines. - \li \uicontrol {Diff Source Line} sets the color of lines that contain removed - text. + \li \uicontrol {Diff Source Line} sets the color of lines that contain + removed text. - \li \uicontrol {Diff Source Character} sets the color that indicates removed - characters. + \li \uicontrol {Diff Source Character} sets the color that indicates + removed characters. - \li \uicontrol {Diff Destination Line} sets the color of lines that contain - added text. + \li \uicontrol {Diff Destination Line} sets the color of lines that + contain added text. - \li \uicontrol {Diff Destination Character} sets the color that indicates - added characters. + \li \uicontrol {Diff Destination Character} sets the color that + indicates added characters. \endlist To only show text changes, select \uicontrol {Ignore Whitespace}. To expand the context for the changes, set the number of unchanged lines to - show in \uicontrol {Context lines}. Set the value to -1 to show the whole file. + show in \uicontrol {Context lines}. Set the value to -1 to show the whole + file. By default, the horizontal scroll bars in the left and right pane are synchronized. To use them independently of each other, select the |