Source Compare Wizard |
Source Compare Wizard
This wizard is used to compare two source files or contents between editor and disk. Both Delphi/C++Builder are supported.
The screenshot below shows the difference between editor and disk of a single source file.
The main area shows the two source file and their difference. The thin right panel shows the thumbnail. You can locate the positon by clicking this panel.
Menus
File
Open File 1: Open a file in left window.
Open File 2: Open a file in right window.
Save Merged File: Save merged content to a file. It's only enabled when in merging mode.
Exit: Close this window.
Options
Ignore Blank Space: Whether ignore blank space when comparing.
Ignore Case: Whether ignore case when comparing.
Only Difference: If this was selected, only different part wil be show in windows. This time merging function is not supported.
Horizontal Split: Split the two window horizontally or vertically.
Highlight Color: You can set the color for display of 'Added', 'Modified' and 'Deleted' lines. It can be done by clicking the bottom-left rectangles, too.
Font: Set display font.
Operation
Source Code Compare: Compare the sources. Shortcut is F9.
Refresh and Re-compare: Reload sources and redo the compare operation.
Abort Comparison: Cancel operation when comparing.
Previous Difference: Goto the previous difference in souce window.
Next Difference: Goto the next difference in souce window.
Return to Source Code Editor: Open the selecte source file in IDE's source editor and goto the current line. Double clicking the source also can goto source editor when not in merging mode.
Merge Files: Merge two files. You can select how to merge: Left/right file is primary or use intersection.
Merge Current Text: This function is used to copy selected line to merge result window when source file window is focused. Double clicking source file window also can do this in merging mode.
Edit Current Text: Edit current line when merging result window is focused. Double clicking result window also can do this in merging mode.
Help
Display Help: Show this help.
Toolbar butttons
The functions of toolbar buttons are the same as menu items.
Buttons on the top of source windows
Left Button: Open source file.
Saved File/Editor Buffer/Backup File: You can select which file to load. They can be saved file or content in current source editor or backup files, such as *.~pas.
Right Button: Some operations in dropdown menu, including refresh, open file list all files in IDE and history files.
Merge Files
Beside comparison, merging is also supported as below:
For Operations' details, you can see 'Menus'.
Merging result window is show as below:
Note: Line count after editing must be identical as before editing. Blank lines will be auto added when lacking, and the surplus will be truncated.
Links