-
-
Notifications
You must be signed in to change notification settings - Fork 139
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Compare Plugin v2.1 by Pavel Nedev: Help - Overview #116
Comments
Hello Yaron, I have added Help.md file and updated the About dialog accordingly - 31a90d4. Please make any modifications necessary directly in the Help.md file and if you like you can open Pull Request to merge those directly in the repo. Otherwise you can simply send me the changed help file. Ah, I just noticed that you can edit the Help.md file in-place here (directly here in GitHub) just like you edit / write an issue text. Perhaps this is the best option. I don't know if you'll have enough permissions to do that though, you'll have to try it yourself. Thank you. BR |
Hello Pavel, Thank you for adding the Help.md file and for the explanation. 👍 I'm not allowed to modify it; so I'll send you my modified file (when we're done with the Moved questions). BR |
Hello Yaron, OK, that will do, thanks. BR |
Is version 2.1 available? I only see a download for 2.0? |
No, 2.1 was a reference to a development version. |
Thank you. I'm looking forward to the ability to compare only the selected
portions of the file.
…On Thu, Nov 29, 2018 at 5:42 AM Pavel Nedev ***@***.***> wrote:
No, 2.1 was a reference to a development version.
Version 3.0 is about to be released some time in the 'near' (I hope)
future.
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#116 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AE3I0n6nvF5RSgsGuF2O9IJK4b_c00-mks5uz7okgaJpZM4MLxTU>
.
|
Some Notepad++ Features
Single-View mode:
Double-View mode:
You can set the Double-View mode to horizontal or vertical by right-clicking the gripper and using the "Rotate" commands:
It's recommended to restart Notepad++ after shifting from horizontal to vertical split or vice-versa.
Compare Plugin Concept
Compare Plugin (CP) assumes that you would normally want to compare an old version of your work vs. its new version.
CP regards the new file as the (more) important one. Your focal file.
Compare
You can initiate a Compare in three ways:
1. Open multiple files (A, B, C, D, - D is active), press "Set as First to Compare", activate file B and press "Compare".
2. Open two files (A, B) and press "Compare".
3. Open multiple files (A, B, C, D), right-click file D's tab and press "Move to Other View" (Notepad++ is now in Double-View mode).
Press "Compare".
Symbols
Added "+": The line only exists in this new file. IOW: the line has been added to the new file, and does not exist in the old one.
Removed "-": The line does not exist in the other new file. IOW: the line has been removed in the new file, and only exists in this old file.
**
NOTE:
If you uncheck the "Detect Moves" option, the meaning of the "+" and "-" symbols would be as follows:
Added "+": The line exists in this location only in this new file. It may be in the old file too but in a different location.
Removed "-": The line does not exist in this location in the other new file. It may be in the new file too but in a different location.
**
Moved: The line appears once in the other file and in a different location.
Moved-Multiple: The line appears multiple times in the other file and in different locations.
Changed: Most of the line is identical in both files. Some changes have been made.
Menu
Compare: Compare all the lines in both files.
Compare Selected Lines: Compare only the selected blocks in both files.
Diff since last Save: Compare the active modified and currently unsaved file to its contents when it was last saved to the disk.
SVN/Git Diff:
Settings
First is: Determines whether the file "Set as First to Compare" should be regarded as the old or new file.
Old file position: Determines whether the old file should be positioned at the left or right view (top/bottom in vertical split).
Single-view default compare to: Determines whether the active file in Single-View mode should be compared to its previous or next file (on "Compare" without "Set First").
Warn about encodings mismatch: Check to display a warning message on trying to compare two files with different encodings (the results might be inaccurate).
Prompt to close files on match: Check to display an option in the "Files Match" message to close the compared files.
Align replacements: If checked, an added (or moved) line in the new file would be aligned with its counterpart removed line in the old file.
If unchecked, blank lines would be inserted for added/removed/moved lines in both files (old CP implementation).
Wrap around diffs: Determines whether the "Next" command should be enabled on reaching the last diff and go to the first diff.
Re-Compare active on Save: Check to automatically re-Compare the active Compare on saving its files.
Go to first diff after re-Compare: If unchecked, the caret position would not change on re-Compare.
Compact Navigation Bar:
Shortcuts
The old
Alt+D
has been removed in order to avoid conflict with Windows convention of Alt+LETTER opening the menu.You can set your own shortcuts to all CP commands via Notepad++ Settings -> Shortcut Mapper -> Plugin Commands.
Icons
You can use the excellent Customize Toolbar plugin (by Dave) to add, move and remove any toolbar buttons.
Requests and Issues-Report
Thank you for Donating.
The text was updated successfully, but these errors were encountered: