forked from qt-creator/qt-creator
Doc: new diff editor buttons
For reloading changed files and viewing changes in a unified view. Change-Id: Ic6cedb6c534c34e6aed3973add2087e96fb6aa57 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 46 KiB |
BIN
doc/images/qtcreator-switchto-sidebyside-diffeditor.png
Normal file
BIN
doc/images/qtcreator-switchto-sidebyside-diffeditor.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 273 B |
BIN
doc/images/qtcreator-switchto-unified-diffeditor.png
Normal file
BIN
doc/images/qtcreator-switchto-unified-diffeditor.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 255 B |
@@ -51,6 +51,15 @@
|
|||||||
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.
|
||||||
|
|
||||||
|
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}).
|
||||||
|
|
||||||
|
To switch back to the side-by-side view, select
|
||||||
|
\inlineimage qtcreator-switchto-sidebyside-diffeditor.png
|
||||||
|
(\gui {Switch to Side by Side Diff Editor}).
|
||||||
|
|
||||||
To change the default colors, select \gui Tools > \gui Options >
|
To change the default colors, select \gui Tools > \gui Options >
|
||||||
\gui {Text Editor} > \gui {Font & Colors}. Create your own color scheme and
|
\gui {Text Editor} > \gui {Font & Colors}. Create your own color scheme and
|
||||||
select new colors for the following options:
|
select new colors for the following options:
|
||||||
@@ -86,4 +95,8 @@
|
|||||||
synchronized. To use them independently of each other, select the
|
synchronized. To use them independently of each other, select the
|
||||||
\inlineimage qtcreator-synchronizefocus.png
|
\inlineimage qtcreator-synchronizefocus.png
|
||||||
(\gui {Synchronize Horizontal Scroll Bars}) button.
|
(\gui {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.
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user