feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: Reformat

Browse Source 
No text changes

Change-Id: Iabfdbdd19b255172b8f59fc5ed4ba55f1168e7d6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-06-18 13:50:44 +02:00
parent 5b40e5b983
commit 3a9266232b
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
doc/src/editors/creator-diff-editor.qdoc
View File

@@ -45,8 +45,8 @@
\endlist \endlist
The differences are output in the \uicontrol Edit mode. Color coding is used to The differences are output in the \uicontrol Edit mode. Color coding is used
mark changed lines. By default, light red indicates lines that contain 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 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 indicates lines that contain added text (painted a darker green) in the
right pane. right pane.
@@ -65,35 +65,36 @@
(\uicontrol {Switch to Side by Side Diff Editor}). (\uicontrol {Switch to Side by Side Diff Editor}).
To change the default colors, select \uicontrol Tools > \uicontrol Options > To change the default colors, select \uicontrol Tools > \uicontrol Options >
\uicontrol {Text Editor} > \uicontrol {Font & Colors}. Create your own color scheme and \uicontrol {Text Editor} > \uicontrol {Font & Colors}. Create your own color
select new colors for the following options: scheme and select new colors for the following options:
\list \list
\li \uicontrol {Diff File Line} sets the color of the line that shows the \li \uicontrol {Diff File Line} sets the color of the line that shows
path and filename of the changed file. the path and filename of the changed file.
\li \uicontrol {Diff Context Line} sets the color of the line that shows \li \uicontrol {Diff Context Line} sets the color of the line that
the number of hidden lines between changed lines. shows the number of hidden lines between changed lines.
\li \uicontrol {Diff Source Line} sets the color of lines that contain removed \li \uicontrol {Diff Source Line} sets the color of lines that contain
text. removed text.
\li \uicontrol {Diff Source Character} sets the color that indicates removed \li \uicontrol {Diff Source Character} sets the color that indicates
characters. removed characters.
\li \uicontrol {Diff Destination Line} sets the color of lines that contain \li \uicontrol {Diff Destination Line} sets the color of lines that
added text. contain added text.
\li \uicontrol {Diff Destination Character} sets the color that indicates \li \uicontrol {Diff Destination Character} sets the color that
added characters. indicates added characters.
\endlist \endlist
To only show text changes, select \uicontrol {Ignore Whitespace}. To only show text changes, select \uicontrol {Ignore Whitespace}.
To expand the context for the changes, set the number of unchanged lines to 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 By default, the horizontal scroll bars in the left and right pane are
synchronized. To use them independently of each other, select the synchronized. To use them independently of each other, select the