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

Replace "Match similar lines" with "Align similar lines" #2230

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Replace "Match similar lines" with "Align similar lines" #2230

merged 2 commits into from
Feb 29, 2024

Conversation

vlakoff
Copy link
Contributor

@vlakoff vlakoff commented Feb 29, 2024

This PR is a follow-up to #1200.

  • One commit is for the documentation, so that it matches the setting name that is displayed in the program.
  • The other commit is for the program source, better make things consistent.

@sdottaka sdottaka merged commit c15957b into WinMerge:master Feb 29, 2024
5 checks passed
@sdottaka
Copy link
Member

Thank you for the PR!
I have merged this PR.
However, since the compatibility of the configuration information will be lost, I would like to restore part of Line 212 of OptionsDef.h to the following.

inline const String OPT_CMP_ALIGN_SIMILAR_LINES {_T("Settings/AlignSimilarLines"s)};

inline const String OPT_CMP_ALIGN_SIMILAR_LINES {_T("Settings/MatchSimilarLines"s)};

@vlakoff
Copy link
Contributor Author

vlakoff commented Feb 29, 2024

Could you please elaborate on what could have been the issue? From what I understood, it is a constant so the actual value it contains isn't important, what we use is the symbol.

By the way, there is a remaining entry that you may want to replace as well: the <title>類似行をマッチさせる<indexterm>, in Docs/Manual/Japanese/Configuration.xml.

@sdottaka
Copy link
Member

The string above is the key name used to save or load the “Align similar lines” checkbox value to the registry or INI file.
If this is changed, the "Align similar lines" checkbox will revert to an unchecked state in the new WinMerge version, even if the "Align similar lines" checkbox was checked in an earlier WinMerge version.

@vlakoff
Copy link
Contributor Author

vlakoff commented Mar 1, 2024

Understood, thanks for the clarification.

Agree that keeping the current configuration item name is the best to do. It should not be very bad, it seems there are other configuration items in the same case, having functionnality that has slightly diverged over time from the unchanging configuration item name.

@vlakoff vlakoff deleted the similar_lines branch March 1, 2024 04:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants