From 5570798f54a8b77cdc782db2b8e659cc6a89691f Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 31 Oct 2016 10:46:22 +0100 Subject: [PATCH] Doc: Describe new Diff editor options You can now view unsaved changes in the current file or all open files. Added a subtitle and moved the image to the new section. Change-Id: I8135dc7c9e2edc60b88d84a241f6d959ba590464 Reviewed-by: Jarek Kobus --- doc/src/editors/creator-diff-editor.qdoc | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/doc/src/editors/creator-diff-editor.qdoc b/doc/src/editors/creator-diff-editor.qdoc index 33e6250fb28..b9b16e80d21 100644 --- a/doc/src/editors/creator-diff-editor.qdoc +++ b/doc/src/editors/creator-diff-editor.qdoc @@ -37,22 +37,32 @@ \title Comparing Files - You can use a diff editor from \QC to compare two text files. They can be - either versions of the same file or arbitrary files. + You can use a diff editor to display unsaved changed in the current file or + all open files or to compare any two text files that can be either versions + of the same file or arbitrary files. - \image creator-diff-editor.png "Diff editor output in the Edit mode" + To view unsaved changes in the current file, select \uicontrol Tools > + \uicontrol Diff > \uicontrol {Diff Current File}. - To compare files: + To view unsaved changes in all open files, select \uicontrol Tools > + \uicontrol Diff > \uicontrol {Diff Open Files}. + + To compare two files: \list 1 - \li Select \uicontrol Tools > \uicontrol Diff. + \li Select \uicontrol Tools > \uicontrol Diff > + \uicontrol {Diff External Files}. \li Select two files to compare. \endlist - The differences are output in the \uicontrol Edit mode. Color coding is used + \section1 Viewing the Changes + + \image creator-diff-editor.png "Diff editor output in the Edit mode" + + The changes are displayed 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