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

Doc: use \uicontrol command instead of \gui macro

Browse Source 
Change-Id: Idc898b6ac70b6d3186d353086b5f3e45830d1f83
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
This commit is contained in:
Leena Miettinen
2014-12-11 15:43:19 +01:00
committed by Leena Miettinen
parent c9696aa6f4
commit e1fbeedcd4
97 changed files with 1955 additions and 1876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,13 +39,13 @@
\list 1
\li Select \gui Tools > \gui Diff.
\li Select \uicontrol Tools > \uicontrol Diff.
\li Select two files to compare.
\endlist
The differences are output in the \gui Edit mode. Color coding is used to
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
@@ -54,49 +54,49 @@
To view the differences in a unified view where changed rows are placed
below each other, select
\inlineimage qtcreator-switchto-unified-diffeditor.png
(\gui {Switch to Unified Diff Editor}).
(\uicontrol {Switch to Unified Diff Editor}).
To switch back to the side-by-side view, select
\inlineimage qtcreator-switchto-sidebyside-diffeditor.png
(\gui {Switch to Side by Side Diff Editor}).
(\uicontrol {Switch to Side by Side Diff Editor}).
To change the default colors, select \gui Tools > \gui Options >
\gui {Text Editor} > \gui {Font & Colors}. Create your own color scheme and
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:
\list
\li \gui {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 the
path and filename of the changed file.
\li \gui {Diff Context Line} sets the color of the line that shows
\li \uicontrol {Diff Context Line} sets the color of the line that shows
the number of hidden lines between changed lines.
\li \gui {Diff Source Line} sets the color of lines that contain removed
\li \uicontrol {Diff Source Line} sets the color of lines that contain removed
text.
\li \gui {Diff Source Character} sets the color that indicates removed
\li \uicontrol {Diff Source Character} sets the color that indicates removed
characters.
\li \gui {Diff Destination Line} sets the color of lines that contain
\li \uicontrol {Diff Destination Line} sets the color of lines that contain
added text.
\li \gui {Diff Destination Character} sets the color that indicates
\li \uicontrol {Diff Destination Character} sets the color that indicates
added characters.
\endlist
To only show text changes, select \gui {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
show in \gui {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
\inlineimage qtcreator-synchronizefocus.png
(\gui {Synchronize Horizontal Scroll Bars}) button.
(\uicontrol {Synchronize Horizontal Scroll Bars}) button.
If the files change outside \QC, select
\inlineimage qtcreator-regenerate-index.png
(\gui {Reload Editor}) to compare them again and to show the results.
(\uicontrol {Reload Editor}) to compare them again and to show the results.
*/