diff --git a/doc/images/creator-diff-editor.png b/doc/images/creator-diff-editor.png index 54f39992ffb..bfa3ad376f1 100644 Binary files a/doc/images/creator-diff-editor.png and b/doc/images/creator-diff-editor.png differ diff --git a/doc/images/qtcreator-switchto-sidebyside-diffeditor.png b/doc/images/qtcreator-switchto-sidebyside-diffeditor.png new file mode 100644 index 00000000000..dfcfbe02463 Binary files /dev/null and b/doc/images/qtcreator-switchto-sidebyside-diffeditor.png differ diff --git a/doc/images/qtcreator-switchto-unified-diffeditor.png b/doc/images/qtcreator-switchto-unified-diffeditor.png new file mode 100644 index 00000000000..9d605aeb195 Binary files /dev/null and b/doc/images/qtcreator-switchto-unified-diffeditor.png differ diff --git a/doc/src/editors/creator-diff-editor.qdoc b/doc/src/editors/creator-diff-editor.qdoc index b7b85510ed4..c55712f87ab 100644 --- a/doc/src/editors/creator-diff-editor.qdoc +++ b/doc/src/editors/creator-diff-editor.qdoc @@ -51,6 +51,15 @@ indicates lines that contain added text (painted a darker green) in the 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 > \gui {Text Editor} > \gui {Font & Colors}. Create your own color scheme and select new colors for the following options: @@ -86,4 +95,8 @@ synchronized. To use them independently of each other, select the \inlineimage qtcreator-synchronizefocus.png (\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. */