Skip to content
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

Closed
Yaron10 opened this issue Feb 24, 2017 · 6 comments
Closed

Compare Plugin v2.1 by Pavel Nedev: Help - Overview #116

Yaron10 opened this issue Feb 24, 2017 · 6 comments

Comments

@Yaron10
Copy link

Yaron10 commented Feb 24, 2017

Some Notepad++ Features

Single-View mode:
image

Double-View mode:
image

You can set the Double-View mode to horizontal or vertical by right-clicking the gripper and using the "Rotate" commands:
image

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".

  • File B - active when you pressed "Compare" - is regarded as the new file and compared to the old file D (default - see Settings).
  • The new file is positioned at the right view (default).

2. Open two files (A, B) and press "Compare".

  • File B (new) is compared to file A.

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".

  • File D (new, default) is compared to file C.

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.

  • The "+" symbol will only appear in the new file, and the "-" symbol will only appear in the old file.

image

**
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.
image

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.
image

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).
image

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.

@pnedev
Copy link
Owner

pnedev commented Mar 1, 2017

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.
If you can you could also try to embed the images directly in the Help.md file itself. Here is what GitHub says about markdown: https://guides.github.com/features/mastering-markdown/.
To see info about images in particular please select in the link above the "Images" tab from the "Examples" section.

Thank you.

BR

@Yaron10
Copy link
Author

Yaron10 commented Mar 1, 2017

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

@Yaron10 Yaron10 closed this as completed Mar 1, 2017
@pnedev
Copy link
Owner

pnedev commented Mar 2, 2017

Hello Yaron,

OK, that will do, thanks.

BR

@peterkronenberg
Copy link

Is version 2.1 available? I only see a download for 2.0?

@pnedev
Copy link
Owner

pnedev commented Nov 29, 2018

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.

@peterkronenberg
Copy link

peterkronenberg commented Nov 29, 2018 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants